Bump jRuby

railsadminteam · Nov 28, 2023 · 5beaf7c · 5beaf7c
1 parent cb2edd3
commit 5beaf7c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,13 +77,13 @@ jobs:
             orm: mongoid
             adapter: sqlite3
             asset: sprockets
-          - ruby: jruby-9.3
-            gemfile: gemfiles/rails_6.1.gemfile
+          - ruby: jruby-9.4
+            gemfile: gemfiles/rails_7.0.gemfile
             orm: active_record
             adapter: mysql2
             asset: sprockets
-          - ruby: jruby-9.3
-            gemfile: gemfiles/rails_6.1.gemfile
+          - ruby: jruby-9.4
+            gemfile: gemfiles/rails_7.0.gemfile
             orm: mongoid
             adapter: sqlite3
             asset: sprockets

diff --git a/Appraisals b/Appraisals
@@ -83,6 +83,12 @@ appraise 'rails-7.0' do
   group :active_record do
     gem 'pg', '>= 1.0.0', platforms: :ruby
     gem 'paper_trail', '>= 12.0'
+
+    platforms :jruby do
+      gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
+      gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
+      gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
+    end
   end
 
   group :mongoid do

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -20,6 +20,12 @@ group :active_record do
     gem "mysql2", ">= 0.3.14"
     gem "sqlite3", ">= 1.3"
   end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 70.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
+    gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
+  end
 end
 
 group :development, :test do