Update Ruby and Apartment versions for Rails 8.0 support (#309)

* Update Ruby and Apartment versions; add new gemfiles for Rails 8.0 support * Exclude testing Ruby 3.1 and Rails 8
rails-on-services · Jan 9, 2025 · 9d95388 · 9d95388
1 parent 261a797
commit 9d95388
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 175 deletions.
diff --git a/.github/workflows/rspec_mysql_8_0.yml b/.github/workflows/rspec_mysql_8_0.yml
@@ -20,18 +20,23 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           - jruby
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
+          - 8_0
         exclude:
           - ruby_version: jruby
             rails_version: 7_1
           - ruby_version: jruby
             rails_version: 7_2
+          - ruby_version: jruby
+            rails_version: 8_0
+          - ruby_version: 3.1
+            rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_mysql.gemfile
       CI: true

diff --git a/.github/workflows/rspec_pg_14.yml b/.github/workflows/rspec_pg_14.yml
@@ -20,18 +20,23 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           - jruby
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
+          - 8_0
         exclude:
           - ruby_version: jruby
             rails_version: 7_1
           - ruby_version: jruby
             rails_version: 7_2
+          - ruby_version: jruby
+            rails_version: 8_0
+          - ruby_version: 3.1
+            rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
       CI: true

diff --git a/.github/workflows/rspec_pg_15.yml b/.github/workflows/rspec_pg_15.yml
@@ -20,18 +20,23 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           - jruby
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
+          - 8_0
         exclude:
           - ruby_version: jruby
             rails_version: 7_1
           - ruby_version: jruby
             rails_version: 7_2
+          - ruby_version: jruby
+            rails_version: 8_0
+          - ruby_version: 3.1
+            rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
       CI: true

diff --git a/.github/workflows/rspec_pg_16.yml b/.github/workflows/rspec_pg_16.yml
@@ -20,18 +20,22 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           - jruby
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
         exclude:
           - ruby_version: jruby
             rails_version: 7_1
           - ruby_version: jruby
             rails_version: 7_2
+          - ruby_version: jruby
+            rails_version: 8_0
+          - ruby_version: 3.1
+            rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
       CI: true

diff --git a/.github/workflows/rspec_pg_17.yml b/.github/workflows/rspec_pg_17.yml
@@ -20,18 +20,23 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           - jruby
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
+          - 8_0
         exclude:
           - ruby_version: jruby
             rails_version: 7_1
           - ruby_version: jruby
             rails_version: 7_2
+          - ruby_version: jruby
+            rails_version: 8_0
+          - ruby_version: 3.1
+            rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
       CI: true

diff --git a/.github/workflows/rspec_sqlite_3.yml b/.github/workflows/rspec_sqlite_3.yml
@@ -20,18 +20,23 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
           # - jruby # We don't support jruby for sqlite yet
         rails_version:
           - 6_1
           - 7_0
           - 7_1
           - 7_2
-          # - master # versions failing
+          - 8_0
         exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
+          - ruby_version: 3.1
+            rails_version: 8_0
+        #   - ruby_version: jruby
+        #     rails_version: 7_1
+        #   - ruby_version: jruby
+        #     rails_version: 7_2
+        #   - ruby_version: jruby
+        #     rails_version: 8_0
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_sqlite3.gemfile
       CI: true

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/Appraisals b/Appraisals
@@ -99,33 +99,6 @@ appraise 'rails-7-1-sqlite3' do
   gem 'sqlite3', '~> 2.1'
 end
 
-appraise 'rails-7-1-jdbc-postgresql' do
-  gem 'rails', '~> 7.1.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
-    gem 'jdbc-postgres'
-  end
-end
-
-appraise 'rails-7-1-jdbc-mysql' do
-  gem 'rails', '~> 7.1.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
-    gem 'jdbc-mysql'
-  end
-end
-
-appraise 'rails-7-1-jdbc-sqlite3' do
-  gem 'rails', '~> 7.1.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
-    gem 'jdbc-sqlite3'
-  end
-end
-
 appraise 'rails-7-2-postgresql' do
   gem 'rails', '~> 7.2.0'
   gem 'pg', '~> 1.5'
@@ -141,42 +114,17 @@ appraise 'rails-7-2-sqlite3' do
   gem 'sqlite3', '~> 2.1'
 end
 
-appraise 'rails-7-2-jdbc-postgresql' do
-  gem 'rails', '~> 7.2.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
-    gem 'jdbc-postgres'
-  end
+appraise 'rails-8-0-postgresql' do
+  gem 'rails', '~> 8.0.0'
+  gem 'pg', '~> 1.5'
 end
 
-appraise 'rails-7-2-jdbc-mysql' do
-  gem 'rails', '~> 7.2.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
-    gem 'jdbc-mysql'
-  end
+appraise 'rails-8-0-mysql' do
+  gem 'rails', '~> 8.0.0'
+  gem 'mysql2', '~> 0.5'
 end
 
-appraise 'rails-7-2-jdbc-sqlite3' do
-  gem 'rails', '~> 7.2.0'
-  platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 70.0'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
-    gem 'jdbc-sqlite3'
-  end
+appraise 'rails-8-0-sqlite3' do
+  gem 'rails', '~> 8.0.0'
+  gem 'sqlite3', '~> 2.1'
 end
-
-# Install Rails from the main branch are failing
-# appraise 'rails-master' do
-#   gem 'rails', git: 'https://github.com/rails/rails.git'
-#   platforms :ruby do
-#     gem 'sqlite3', '~> 2.0'
-#   end
-#   platforms :jruby do
-#     gem 'activerecord-jdbc-adapter', '~> 61.0'
-#     gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
-#     gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
-#   end
-# end
diff --git a/gemfiles/rails_7_1_jdbc_postgresql.gemfile b/gemfiles/rails_7_1_jdbc_postgresql.gemfile
diff --git a/gemfiles/rails_7_1_jdbc_sqlite3.gemfile b/gemfiles/rails_7_1_jdbc_sqlite3.gemfile
diff --git a/gemfiles/rails_7_2_jdbc_postgresql.gemfile b/gemfiles/rails_7_2_jdbc_postgresql.gemfile
diff --git a/gemfiles/rails_7_1_jdbc_mysql.gemfile → gemfiles/rails_8_0_mysql.gemfile b/gemfiles/rails_7_1_jdbc_mysql.gemfile → gemfiles/rails_8_0_mysql.gemfile
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
 gem "rubocop-rspec", "~> 3.1"
 gem "rubocop-thread_safety", "~> 0.4"
 gem "simplecov", require: false
-gem "rails", "~> 7.1.0"
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 70.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 70.0"
-  gem "jdbc-mysql"
-end
+gem "rails", "~> 8.0.0"
+gem "mysql2", "~> 0.5"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_2_jdbc_mysql.gemfile → gemfiles/rails_8_0_postgresql.gemfile b/gemfiles/rails_7_2_jdbc_mysql.gemfile → gemfiles/rails_8_0_postgresql.gemfile
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
 gem "rubocop-rspec", "~> 3.1"
 gem "rubocop-thread_safety", "~> 0.4"
 gem "simplecov", require: false
-gem "rails", "~> 7.2.0"
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 70.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 70.0"
-  gem "jdbc-mysql"
-end
+gem "rails", "~> 8.0.0"
+gem "pg", "~> 1.5"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_2_jdbc_sqlite3.gemfile → gemfiles/rails_8_0_sqlite3.gemfile b/gemfiles/rails_7_2_jdbc_sqlite3.gemfile → gemfiles/rails_8_0_sqlite3.gemfile
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
 gem "rubocop-rspec", "~> 3.1"
 gem "rubocop-thread_safety", "~> 0.4"
 gem "simplecov", require: false
-gem "rails", "~> 7.2.0"
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 70.0"
-  gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
-  gem "jdbc-sqlite3"
-end
+gem "rails", "~> 8.0.0"
+gem "sqlite3", "~> 2.1"
 
 gemspec path: "../"
diff --git a/lib/apartment/version.rb b/lib/apartment/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end