Skip to content

Commit 898f3d0

Browse files
authored
Merge pull request #7 from appfolio/bank_appraise_ruby_34_rails_80
[BANK-1370] Appraise Ruby 3.4 and ActiveRecord 8
2 parents 73541b8 + b7ede28 commit 898f3d0

File tree

8 files changed

+27
-23
lines changed

8 files changed

+27
-23
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ workflows:
1212
matrix:
1313
parameters:
1414
ruby_version:
15-
- '3.3.0'
16-
- '3.2.1'
17-
- '3.1.3'
15+
- '3.4.1'
16+
- '3.3.6'
17+
- '3.2.5'

.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/.bundle/
2-
/.yardoc
3-
/Gemfile.lock
4-
/_yardoc/
52
/coverage/
6-
/doc/
73
/pkg/
8-
/spec/reports/
94
/tmp/
10-
/gemfiles/*.lock
5+
6+
# Only generate Appraisal gemfiles on CI
7+
/gemfiles/
8+
9+
# Ignore generated files
10+
Gemfile.lock
11+
*.log
1112
*.gem

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-3.4.1

Appraisals

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
# frozen_string_literal: true
22

33
case RUBY_VERSION
4-
when '3.1.3', '3.2.1', '3.3.0'
5-
appraise "ruby-#{RUBY_VERSION}_activerecord61" do
6-
source 'https://rubygems.org' do
7-
gem 'activerecord', '~> 6.1.0'
8-
end
9-
end
10-
4+
when '3.2.5', '3.3.6', '3.4.1'
115
appraise "ruby-#{RUBY_VERSION}_activerecord70" do
126
source 'https://rubygems.org' do
137
gem 'activerecord', '~> 7.0.0'
@@ -25,6 +19,12 @@ when '3.1.3', '3.2.1', '3.3.0'
2519
gem 'activerecord', '~> 7.2.0'
2620
end
2721
end
22+
23+
appraise "ruby-#{RUBY_VERSION}_activerecord80" do
24+
source 'https://rubygems.org' do
25+
gem 'activerecord', '~> 8.0.0'
26+
end
27+
end
2828
else
2929
raise "Unsupported Ruby version #{RUBY_VERSION}"
3030
end

Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ source 'https://rubygems.org' # global source
44

55
source 'https://rubygems.org' do
66
gem 'appraisal', '>= 2.5', '< 3'
7-
gem 'bundler', '>= 2.2', '< 3'
8-
gem 'debug', '>= 1.9', '< 2'
7+
gem 'bundler', '>= 2.6', '< 3'
8+
gem 'debug', '>= 1.10', '< 2'
99
gem 'minitest-reporters', '>= 1.7', '< 2'
10-
gem 'mocha', '>= 2.4', '< 3'
11-
gem 'rake', '>= 13', '< 14'
10+
gem 'mocha', '>= 2.7', '< 3'
11+
gem 'mutex_m', '>= 0.3', '< 1' # Needed for rails 7.x / ruby 3.4+
12+
gem 'rake', '>= 13.2', '< 14'
1213
end
1314

1415
gemspec

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2020-2024 AppFolio, Inc
1+
Copyright (c) 2020-2025 AppFolio, Inc
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

ae_check_migrations_load_silently.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
1515
spec.files = Dir['**/*'].select { |f| f[%r{^(lib/|LICENSE.txt|.*gemspec)}] }
1616
spec.require_paths = ['lib']
1717

18-
spec.required_ruby_version = Gem::Requirement.new('< 3.4')
18+
spec.required_ruby_version = Gem::Requirement.new('< 3.5')
1919
spec.metadata['allowed_push_host'] = 'https://rubygems.org'
2020

21-
spec.add_dependency('activerecord', ['>= 6.1', '< 7.3'])
21+
spec.add_dependency('activerecord', ['>= 7', '< 8.1'])
2222
spec.add_dependency('minitest', ['>= 5.8', '< 6'])
2323
end

test/test_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
end
1919
end
2020

21+
require 'logger' # Due to issue with activesupport / concurrent-ruby
2122
require 'ae_check_migrations_load_silently'
2223
require 'debug'
2324
require 'minitest/autorun'

0 commit comments

Comments
 (0)