try newer rails

grosser · May 20, 2024 · fe21e4c · fe21e4c
1 parent e3cbe56
commit fe21e4c
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 210 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -11,11 +11,11 @@ jobs:
       matrix:
         ruby: [ '3.0' ]
         task: [ 'default' ]
-        gemfile: [ 'rails52' ]
+        gemfile: [ 'rails71' ]
         include:
         - ruby: '3.0' # lowest supported version
           task: rubocop
-          gemfile: rails52
+          gemfile: rails71
     name: ${{ matrix.ruby }} ${{ matrix.gemfile }} rake ${{ matrix.task }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.0
         bundler-cache: true
     - run: gem i gettext && gem i activesupport && bundle exec rake benchmark
   namespaces:
@@ -41,6 +41,6 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.0
         bundler-cache: true
     - run: echo 'gem "gettext"' >> Gemfile && echo 'gem "iconv"' >> Gemfile && bundle config unset deployment && bundle && bundle exec rake namespaces
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,29 +7,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     bump (0.7.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.3)
+    drb (2.2.1)
     forking_test_runner (1.3.0)
       parallel_tests (>= 1.3.7)
     forwardable (1.3.3)
-    i18n (1.2.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     mini_portile2 (2.8.6)
-    minitest (5.11.3)
+    minitest (5.23.0)
+    mutex_m (0.2.0)
     parallel (1.21.0)
     parallel_tests (2.27.0)
       parallel
@@ -73,13 +82,15 @@ GEM
     singleton (0.2.0)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    sqlite3 (1.6.9-x86_64-linux)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   activerecord

diff --git a/fast_gettext.gemspec b/fast_gettext.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new name, FastGettext::VERSION do |s|
   s.homepage = "https://github.com/grosser/#{name}"
   s.files = Dir["{lib/**/*.{rb,mo,rdoc},Readme.md,CHANGELOG,LICENSE}"]
   s.licenses = ["MIT", "Ruby"]
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 3.0.0'
   s.add_runtime_dependency 'prime'
 
   s.add_development_dependency 'rake'

diff --git a/gemfiles/rails52.gemfile.lock b/gemfiles/rails52.gemfile.lock
diff --git a/gemfiles/rails52.gemfile → gemfiles/rails71.gemfile b/gemfiles/rails52.gemfile → gemfiles/rails71.gemfile
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec path: "../"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 7.1.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ source "https://rubygems.org"

		gemspec path: "../"

		gem "rails", "~> 5.2.0"
		gem "rails", "~> 7.1.0"