From 9e5926080ccba4ba6e4ba667e2d4c58f9841720a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 3 Jan 2023 22:22:45 +0000 Subject: [PATCH 1/2] Drop support to Rails < 5.2 Rails 5.2 is the first version with support to purpose in the `MessageVerifier` so to simplify our implementation we are dropping support to those unsupported Rails versions. --- .github/workflows/ci.yml | 2 +- Gemfile.lock | 2 +- gemfiles/rails_5.0.gemfile | 7 ------- gemfiles/rails_5.1.gemfile | 6 ------ globalid.gemspec | 2 +- 5 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23fb860..7e100a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: fail-fast: false matrix: ruby: [ 2.5, 2.6, 2.7 ] - rails: [ '5.0', '5.1', '5.2', '6.0', '6.1' ] + rails: [ '5.2', '6.0', '6.1' ] include: - ruby: '2.7' rails: '7.0' diff --git a/Gemfile.lock b/Gemfile.lock index e996c30..969d881 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: globalid (1.1.0) - activesupport (>= 5.0) + activesupport (>= 5.2) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index 2a13023..0000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source "https://rubygems.org" - -gem "activemodel", "~> 5.0.0" -gem "railties", "~> 5.0.0" -gem "minitest", "~> 5.10.0" - -gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index edcf449..0000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gem "activemodel", "~> 5.1.0" -gem "railties", "~> 5.1.0" - -gemspec path: "../" diff --git a/globalid.gemspec b/globalid.gemspec index a005c7f..623135f 100644 --- a/globalid.gemspec +++ b/globalid.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir['MIT-LICENSE', 'README.md', 'lib/**/*'] s.require_path = 'lib' - s.add_runtime_dependency 'activesupport', '>= 5.0' + s.add_runtime_dependency 'activesupport', '>= 5.2' s.add_development_dependency 'rake' From f471fd5e62851d60d4d8c3ffbba25f7296ca4af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 4 Jan 2023 18:53:15 +0000 Subject: [PATCH 2/2] Drop support to all unsupported Ruby and Rails versions --- .github/workflows/ci.yml | 36 ++---------------------------------- Gemfile.lock | 2 +- Rakefile | 4 +--- gemfiles/rails_5.2.gemfile | 6 ------ gemfiles/rails_6.0.gemfile | 6 ------ globalid.gemspec | 2 +- 6 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e100a7..bb65dc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,45 +6,13 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ 2.5, 2.6, 2.7 ] - rails: [ '5.2', '6.0', '6.1' ] + ruby: [ '2.7', '3.0', '3.1', 'head', 'truffleruby' ] + rails: [ '6.1', '7.0', 'main' ] include: - - ruby: '2.7' - rails: '7.0' - - ruby: '2.7' - rails: 'main' - - ruby: '3.0' - rails: '6.0' - - ruby: '3.0' - rails: '6.1' - - ruby: '3.0' - rails: '7.0' - - ruby: '3.0' - rails: 'main' - - ruby: '3.1' - rails: '6.1' - - ruby: '3.1' - rails: '7.0' - - ruby: '3.1' - rails: 'main' - ruby: '3.2' rails: '7.0' - ruby: '3.2' rails: 'main' - - ruby: head - rails: '6.0' - - ruby: head - rails: '6.1' - - ruby: head - rails: 'main' - - ruby: truffleruby - rails: '6.0' - - ruby: truffleruby - rails: '6.1' - - ruby: truffleruby - rails: '7.0' - - ruby: truffleruby - rails: 'main' env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile diff --git a/Gemfile.lock b/Gemfile.lock index 969d881..05f8f93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: globalid (1.1.0) - activesupport (>= 5.2) + activesupport (>= 6.1) GEM remote: https://rubygems.org/ diff --git a/Rakefile b/Rakefile index 1c55f46..03bfe05 100644 --- a/Rakefile +++ b/Rakefile @@ -5,9 +5,7 @@ task :default => :test Rake::TestTask.new do |t| t.libs << 'test' - t.test_files = FileList.new('test/cases/**/*_test.rb') do |fl| - fl.exclude('test/cases/pattern_matching_test.rb') if RUBY_VERSION < '2.7' - end + t.test_files = FileList['test/cases/**/*_test.rb'] t.verbose = true t.warning = true end diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 1bb6b29..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gem "activemodel", "~> 5.2.0" -gem "railties", git: "https://github.com/rails/rails", branch: "5-2-stable" - -gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index ea112aa..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gem "activemodel", "~> 6.0.0" -gem "railties", "~> 6.0.0" - -gemspec path: "../" diff --git a/globalid.gemspec b/globalid.gemspec index 623135f..aae6540 100644 --- a/globalid.gemspec +++ b/globalid.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir['MIT-LICENSE', 'README.md', 'lib/**/*'] s.require_path = 'lib' - s.add_runtime_dependency 'activesupport', '>= 5.2' + s.add_runtime_dependency 'activesupport', '>= 6.1' s.add_development_dependency 'rake'