From b0a13aa251dd010b45f5c2dd7f3a9df1c54fbba3 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <seuros@pre-history.com>
Date: Sun, 3 Mar 2024 19:44:20 +0100
Subject: [PATCH 1/2] test in latest version of jruby

---
 .github/workflows/ci-mysql5.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci-mysql5.yml b/.github/workflows/ci-mysql5.yml
index 09c494c..bb47382 100644
--- a/.github/workflows/ci-mysql5.yml
+++ b/.github/workflows/ci-mysql5.yml
@@ -42,6 +42,12 @@ jobs:
           - ruby: jruby
             rails: 6.1
             adapter: jdbcmysql
+          - ruby: jruby
+            rails: "7.0"
+            adapter: jdbcmysql
+          - ruby: jruby
+            rails: 7.1
+            adapter: jdbcmysql
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From a0e81ad0fb016b4930313cf3b59ebe9db30e9253 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <seuros@pre-history.com>
Date: Sun, 3 Mar 2024 20:14:25 +0100
Subject: [PATCH 2/2] update appraisals file

---
 Appraisals                        | 20 ++++++++++++++------
 gemfiles/activerecord_6.1.gemfile |  6 +++---
 gemfiles/activerecord_7.0.gemfile |  6 +++---
 gemfiles/activerecord_7.1.gemfile |  6 ++++++
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Appraisals b/Appraisals
index 5e51862..6511e0f 100644
--- a/Appraisals
+++ b/Appraisals
@@ -8,6 +8,12 @@ appraise 'activerecord-7.1' do
     gem 'trilogy'
     gem 'pg'
   end
+  platforms :jruby do
+    jdbc_version = {github: 'jruby/activerecord-jdbc-adapter', ref: 'master'}
+    gem "activerecord-jdbcmysql-adapter", **jdbc_version
+    gem "activerecord-jdbcpostgresql-adapter", **jdbc_version
+    gem "activerecord-jdbcsqlite3-adapter", **jdbc_version
+  end
 end
 
 appraise 'activerecord-7.0' do
@@ -20,9 +26,10 @@ appraise 'activerecord-7.0' do
     gem 'pg'
   end
   platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter"
-    gem "activerecord-jdbcpostgresql-adapter"
-    gem "activerecord-jdbcsqlite3-adapter"
+    jdbc_version = '~> 70.0'
+    gem "activerecord-jdbcmysql-adapter", jdbc_version
+    gem "activerecord-jdbcpostgresql-adapter", jdbc_version
+    gem "activerecord-jdbcsqlite3-adapter", jdbc_version
   end
 end
 
@@ -37,9 +44,10 @@ appraise 'activerecord-6.1' do
     gem 'pg'
   end
   platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter"
-    gem "activerecord-jdbcpostgresql-adapter"
-    gem "activerecord-jdbcsqlite3-adapter"
+    jdbc_version = '~> 61.0'
+    gem "activerecord-jdbcmysql-adapter", jdbc_version
+    gem "activerecord-jdbcpostgresql-adapter", jdbc_version
+    gem "activerecord-jdbcsqlite3-adapter", jdbc_version
   end
 end
 
diff --git a/gemfiles/activerecord_6.1.gemfile b/gemfiles/activerecord_6.1.gemfile
index b87ebba..3fe58f2 100644
--- a/gemfiles/activerecord_6.1.gemfile
+++ b/gemfiles/activerecord_6.1.gemfile
@@ -13,9 +13,9 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+  gem "activerecord-jdbcsqlite3-adapter", "~> 61.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7.0.gemfile b/gemfiles/activerecord_7.0.gemfile
index 3ef6b18..2cff5d8 100644
--- a/gemfiles/activerecord_7.0.gemfile
+++ b/gemfiles/activerecord_7.0.gemfile
@@ -13,9 +13,9 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~> 70.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
+  gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7.1.gemfile b/gemfiles/activerecord_7.1.gemfile
index a9455ae..c489cdf 100644
--- a/gemfiles/activerecord_7.1.gemfile
+++ b/gemfiles/activerecord_7.1.gemfile
@@ -11,4 +11,10 @@ platforms :ruby do
   gem "pg"
 end
 
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", ref: "master"
+  gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", ref: "master"
+  gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", ref: "master"
+end
+
 gemspec path: "../"