Skip to content

Commit 9d95388

Browse files
mnovelomnovelo
authored
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
1 parent 261a797 commit 9d95388

15 files changed

+56
-175
lines changed

‎.github/workflows/rspec_mysql_8_0.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
- jruby
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
30+
- 8_0
3031
exclude:
3132
- ruby_version: jruby
3233
rails_version: 7_1
3334
- ruby_version: jruby
3435
rails_version: 7_2
36+
- ruby_version: jruby
37+
rails_version: 8_0
38+
- ruby_version: 3.1
39+
rails_version: 8_0
3540
env:
3641
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_mysql.gemfile
3742
CI: true

‎.github/workflows/rspec_pg_14.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
- jruby
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
30+
- 8_0
3031
exclude:
3132
- ruby_version: jruby
3233
rails_version: 7_1
3334
- ruby_version: jruby
3435
rails_version: 7_2
36+
- ruby_version: jruby
37+
rails_version: 8_0
38+
- ruby_version: 3.1
39+
rails_version: 8_0
3540
env:
3641
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
3742
CI: true

‎.github/workflows/rspec_pg_15.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
- jruby
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
30+
- 8_0
3031
exclude:
3132
- ruby_version: jruby
3233
rails_version: 7_1
3334
- ruby_version: jruby
3435
rails_version: 7_2
36+
- ruby_version: jruby
37+
rails_version: 8_0
38+
- ruby_version: 3.1
39+
rails_version: 8_0
3540
env:
3641
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
3742
CI: true

‎.github/workflows/rspec_pg_16.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,22 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
- jruby
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
3030
exclude:
3131
- ruby_version: jruby
3232
rails_version: 7_1
3333
- ruby_version: jruby
3434
rails_version: 7_2
35+
- ruby_version: jruby
36+
rails_version: 8_0
37+
- ruby_version: 3.1
38+
rails_version: 8_0
3539
env:
3640
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
3741
CI: true

‎.github/workflows/rspec_pg_17.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
- jruby
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
30+
- 8_0
3031
exclude:
3132
- ruby_version: jruby
3233
rails_version: 7_1
3334
- ruby_version: jruby
3435
rails_version: 7_2
36+
- ruby_version: jruby
37+
rails_version: 8_0
38+
- ruby_version: 3.1
39+
rails_version: 8_0
3540
env:
3641
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
3742
CI: true

‎.github/workflows/rspec_sqlite_3.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,23 @@ jobs:
2020
- 3.1
2121
- 3.2
2222
- 3.3
23+
- 3.4
2324
# - jruby # We don't support jruby for sqlite yet
2425
rails_version:
2526
- 6_1
2627
- 7_0
2728
- 7_1
2829
- 7_2
29-
# - master # versions failing
30+
- 8_0
3031
exclude:
31-
- ruby_version: jruby
32-
rails_version: 7_1
33-
- ruby_version: jruby
34-
rails_version: 7_2
32+
- ruby_version: 3.1
33+
rails_version: 8_0
34+
# - ruby_version: jruby
35+
# rails_version: 7_1
36+
# - ruby_version: jruby
37+
# rails_version: 7_2
38+
# - ruby_version: jruby
39+
# rails_version: 8_0
3540
env:
3641
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_sqlite3.gemfile
3742
CI: true

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.5
1+
3.3.6

‎Appraisals

+9-61
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,6 @@ appraise 'rails-7-1-sqlite3' do
9999
gem 'sqlite3', '~> 2.1'
100100
end
101101

102-
appraise 'rails-7-1-jdbc-postgresql' do
103-
gem 'rails', '~> 7.1.0'
104-
platforms :jruby do
105-
gem 'activerecord-jdbc-adapter', '~> 70.0'
106-
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
107-
gem 'jdbc-postgres'
108-
end
109-
end
110-
111-
appraise 'rails-7-1-jdbc-mysql' do
112-
gem 'rails', '~> 7.1.0'
113-
platforms :jruby do
114-
gem 'activerecord-jdbc-adapter', '~> 70.0'
115-
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
116-
gem 'jdbc-mysql'
117-
end
118-
end
119-
120-
appraise 'rails-7-1-jdbc-sqlite3' do
121-
gem 'rails', '~> 7.1.0'
122-
platforms :jruby do
123-
gem 'activerecord-jdbc-adapter', '~> 70.0'
124-
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
125-
gem 'jdbc-sqlite3'
126-
end
127-
end
128-
129102
appraise 'rails-7-2-postgresql' do
130103
gem 'rails', '~> 7.2.0'
131104
gem 'pg', '~> 1.5'
@@ -141,42 +114,17 @@ appraise 'rails-7-2-sqlite3' do
141114
gem 'sqlite3', '~> 2.1'
142115
end
143116

144-
appraise 'rails-7-2-jdbc-postgresql' do
145-
gem 'rails', '~> 7.2.0'
146-
platforms :jruby do
147-
gem 'activerecord-jdbc-adapter', '~> 70.0'
148-
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
149-
gem 'jdbc-postgres'
150-
end
117+
appraise 'rails-8-0-postgresql' do
118+
gem 'rails', '~> 8.0.0'
119+
gem 'pg', '~> 1.5'
151120
end
152121

153-
appraise 'rails-7-2-jdbc-mysql' do
154-
gem 'rails', '~> 7.2.0'
155-
platforms :jruby do
156-
gem 'activerecord-jdbc-adapter', '~> 70.0'
157-
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
158-
gem 'jdbc-mysql'
159-
end
122+
appraise 'rails-8-0-mysql' do
123+
gem 'rails', '~> 8.0.0'
124+
gem 'mysql2', '~> 0.5'
160125
end
161126

162-
appraise 'rails-7-2-jdbc-sqlite3' do
163-
gem 'rails', '~> 7.2.0'
164-
platforms :jruby do
165-
gem 'activerecord-jdbc-adapter', '~> 70.0'
166-
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
167-
gem 'jdbc-sqlite3'
168-
end
127+
appraise 'rails-8-0-sqlite3' do
128+
gem 'rails', '~> 8.0.0'
129+
gem 'sqlite3', '~> 2.1'
169130
end
170-
171-
# Install Rails from the main branch are failing
172-
# appraise 'rails-master' do
173-
# gem 'rails', git: 'https://github.com/rails/rails.git'
174-
# platforms :ruby do
175-
# gem 'sqlite3', '~> 2.0'
176-
# end
177-
# platforms :jruby do
178-
# gem 'activerecord-jdbc-adapter', '~> 61.0'
179-
# gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
180-
# gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
181-
# end
182-
# end

‎gemfiles/rails_7_1_jdbc_postgresql.gemfile

-27
This file was deleted.

‎gemfiles/rails_7_1_jdbc_sqlite3.gemfile

-27
This file was deleted.

‎gemfiles/rails_7_2_jdbc_postgresql.gemfile

-27
This file was deleted.

‎gemfiles/rails_7_1_jdbc_mysql.gemfile ‎gemfiles/rails_8_0_mysql.gemfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
1616
gem "rubocop-rspec", "~> 3.1"
1717
gem "rubocop-thread_safety", "~> 0.4"
1818
gem "simplecov", require: false
19-
gem "rails", "~> 7.1.0"
20-
21-
platforms :jruby do
22-
gem "activerecord-jdbc-adapter", "~> 70.0"
23-
gem "activerecord-jdbcmysql-adapter", "~> 70.0"
24-
gem "jdbc-mysql"
25-
end
19+
gem "rails", "~> 8.0.0"
20+
gem "mysql2", "~> 0.5"
2621

2722
gemspec path: "../"

‎gemfiles/rails_7_2_jdbc_mysql.gemfile ‎gemfiles/rails_8_0_postgresql.gemfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
1616
gem "rubocop-rspec", "~> 3.1"
1717
gem "rubocop-thread_safety", "~> 0.4"
1818
gem "simplecov", require: false
19-
gem "rails", "~> 7.2.0"
20-
21-
platforms :jruby do
22-
gem "activerecord-jdbc-adapter", "~> 70.0"
23-
gem "activerecord-jdbcmysql-adapter", "~> 70.0"
24-
gem "jdbc-mysql"
25-
end
19+
gem "rails", "~> 8.0.0"
20+
gem "pg", "~> 1.5"
2621

2722
gemspec path: "../"

‎gemfiles/rails_7_2_jdbc_sqlite3.gemfile ‎gemfiles/rails_8_0_sqlite3.gemfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ gem "rubocop-rake", "~> 0.5"
1616
gem "rubocop-rspec", "~> 3.1"
1717
gem "rubocop-thread_safety", "~> 0.4"
1818
gem "simplecov", require: false
19-
gem "rails", "~> 7.2.0"
20-
21-
platforms :jruby do
22-
gem "activerecord-jdbc-adapter", "~> 70.0"
23-
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
24-
gem "jdbc-sqlite3"
25-
end
19+
gem "rails", "~> 8.0.0"
20+
gem "sqlite3", "~> 2.1"
2621

2722
gemspec path: "../"

‎lib/apartment/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Apartment
4-
VERSION = '3.1.0'
4+
VERSION = '3.2.0'
55
end

0 commit comments

Comments
 (0)