Skip to content

Commit ff74bee

Browse files
authored
Merge pull request #22 from cookpad/support-rails-8
Support ActiveRecord 8.0
2 parents bb9b82e + fdecda7 commit ff74bee

File tree

7 files changed

+27
-10
lines changed

7 files changed

+27
-10
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ jobs:
2525
- gemfiles/ar70.gemfile
2626
- gemfiles/ar71.gemfile
2727
- gemfiles/ar72.gemfile
28+
- gemfiles/ar80.gemfile
29+
exclude:
30+
- # Ruby 3.1 is not supported by ActiveRecord 8.0
31+
ruby: 3.1
32+
gemfile: gemfiles/ar80.gemfile
2833

2934
steps:
3035
- uses: actions/checkout@v4

Appraisals

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

3-
appraise 'ar60' do
4-
gem 'activerecord', '~> 6.0.0'
3+
appraise 'ar70' do
4+
gem 'activerecord', '~> 7.0.0'
5+
gem 'concurrent-ruby', '1.3.4' # https://stackoverflow.com/questions/79360526
56
end
67

7-
appraise 'ar61' do
8-
gem 'activerecord', '~> 6.1.0'
8+
appraise 'ar71' do
9+
gem 'activerecord', '~> 7.1.0'
910
end
1011

11-
appraise 'ar70' do
12-
gem 'activerecord', '~> 7.0.0'
12+
appraise 'ar72' do
13+
gem 'activerecord', '~> 7.2.0'
14+
end
15+
16+
appraise 'ar80' do
17+
gem 'activerecord', '~> 8.0.0'
1318
end

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
88

99
### Added
1010

11-
- Support ActiveRecord 7.1 and 7.2 [#21](https://github.com/cookpad/armg/pull/21)
11+
- Support ActiveRecord 7.1, 7.2, and 8.0 [#21](https://github.com/cookpad/armg/pull/21) [#22](https://github.com/cookpad/armg/pull/22)
1212
- Support Ruby 3.2, 3.3, and 3.4 [#21](https://github.com/cookpad/armg/pull/21)
1313

1414
### Changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ No change
158158
## Supported versions
159159

160160
- Ruby 3.1 to 3.4
161-
- ActiveRecord 7.0 to 7.2
161+
- ActiveRecord 7.0 to 8.0
162162
- MySQL 5.6 to 8.0
163163

164164
### Limitation on MySQL 8.0

armg.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323

2424
spec.metadata['rubygems_mfa_required'] = 'true'
2525

26-
spec.add_dependency 'activerecord', '>= 6', '< 8'
26+
spec.add_dependency 'activerecord', '>= 7'
2727
spec.add_dependency 'rgeo'
2828
spec.add_development_dependency 'appraisal', '>= 2.2.0'
2929
spec.add_development_dependency 'base64'

gemfiles/ar70.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "https://rubygems.org"
44

55
gem "activerecord", "~> 7.0.0"
6-
gem "concurrent-ruby", "1.3.4" # https://stackoverflow.com/questions/79360526
6+
gem "concurrent-ruby", "1.3.4"
77

88
gemspec path: "../"

gemfiles/ar80.gemfile

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

0 commit comments

Comments
 (0)