Skip to content

Commit 4708e8d

Browse files
committed
Upgrade to pass for Rails 8.0
1 parent 3d8911d commit 4708e8d

5 files changed

Lines changed: 26 additions & 5 deletions

File tree

.github/workflows/ruby.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
ruby-version: [ '2.7', '3.0', '3.1', '3.2', '3.3']
13-
rails: ['5_0', '5_1', '5_2', '6_0', '6_1', '7_0', '7_1', '7_2']
13+
rails: ['5_0', '5_1', '5_2', '6_0', '6_1', '7_0', '7_1', '7_2', '8_0']
1414
exclude:
1515
# exclude unsupported ruby versions: https://github.com/rails/rails/issues/40938
1616
- ruby-version: '3.0'
@@ -41,6 +41,10 @@ jobs:
4141
rails: '7_2'
4242
- ruby-version: '3.0'
4343
rails: '7_2'
44+
- ruby-version: '2.7'
45+
rails: '8_0'
46+
- ruby-version: '3.0'
47+
rails: '8_0'
4448

4549
env:
4650
TESTING_RAILS_VERSION: ${{ matrix.rails }}

Appraisals

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,9 @@ appraise "activerecord_7_2" do
4343
gem "activesupport", "~> 7.2.0"
4444
gem "pg", "~> 1.1"
4545
end
46+
47+
appraise "activerecord_8_0" do
48+
gem "activerecord", "~> 8.0.0.rc1"
49+
gem "activesupport", "~> 8.0.0.rc1"
50+
gem "pg", "~> 1.1"
51+
end

crypt_keeper.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
1818

1919
gem.post_install_message = "WARNING: CryptKeeper 2.0 contains breaking changes and may require you to reencrypt your data! Please view the README at https://github.com/jmazzi/crypt_keeper for more information."
2020

21-
gem.add_runtime_dependency 'activerecord', '>= 5.0', '< 8.0'
22-
gem.add_runtime_dependency 'activesupport', '>= 5.0', '< 8.0'
21+
gem.add_runtime_dependency 'activerecord', '>= 5.0', '< 8.1'
22+
gem.add_runtime_dependency 'activesupport', '>= 5.0', '< 8.1'
2323

2424
gem.add_development_dependency 'rspec', '~> 3.5.0'
2525
gem.add_development_dependency 'guard', '~> 2.6.1'
@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
3535
gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
3636
gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
3737
else
38-
gem.add_development_dependency 'sqlite3', '>= 1.3', '< 2.0'
38+
gem.add_development_dependency 'sqlite3', '>= 1.3'
3939
gem.add_development_dependency 'pg', '>= 0.18.0'
4040
gem.add_development_dependency 'mysql2', '>= 0.3.13'
4141
end

gemfiles/activerecord_8_0.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "activerecord", "~> 8.0.0.rc1"
6+
gem "activesupport", "~> 8.0.0.rc1"
7+
gem "pg", "~> 1.1"
8+
gem "sqlite3", ">= 2.1.0"
9+
10+
gemspec :path => "../"

lib/crypt_keeper.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class << self
1919
alias_method :silence_logs?, :silence_logs
2020

2121
def active_record_7_1?
22-
ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
22+
ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1 \
23+
|| ActiveRecord::VERSION::MAJOR >= 8
2324
end
2425
end
2526
end

0 commit comments

Comments
 (0)