Skip to content

Commit b288cb9

Browse files
authored
Merge pull request #79 from procore-oss/drop-ruby-3.0
Require Ruby >= 3.1
2 parents 8095654 + 76be291 commit b288cb9

File tree

10 files changed

+28
-65
lines changed

10 files changed

+28
-65
lines changed

.github/workflows/test.yaml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,38 +43,9 @@ jobs:
4343
- name: Installing dependencies
4444
run: |
4545
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
46-
bundle exec appraisal ar-6.1 bundle install --path=vendor/bundle
47-
bundle exec appraisal ar-7.0 bundle install --path=vendor/bundle
4846
bundle exec appraisal ar-7.1 bundle install --path=vendor/bundle
4947
bundle exec appraisal ar-7.2 bundle install --path=vendor/bundle
5048
- name: Run tests
5149
run: |
52-
bundle exec appraisal ar-6.1 rake test
53-
bundle exec appraisal ar-7.0 rake test
5450
bundle exec appraisal ar-7.1 rake test
5551
bundle exec appraisal ar-7.2 rake test
56-
57-
test-3_0:
58-
strategy:
59-
matrix:
60-
os: [ubuntu-latest]
61-
ruby: ["3.0"]
62-
runs-on: ${{ matrix.os }}
63-
steps:
64-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
65-
- name: Set up Ruby ${{ matrix.ruby }}
66-
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1
67-
with:
68-
ruby-version: ${{ matrix.ruby }}
69-
bundler-cache: true
70-
- name: Installing dependencies
71-
run: |
72-
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
73-
bundle exec appraisal ar-6.1 bundle install --path=vendor/bundle
74-
bundle exec appraisal ar-7.0 bundle install --path=vendor/bundle
75-
bundle exec appraisal ar-7.1 bundle install --path=vendor/bundle
76-
- name: Run tests
77-
run: |
78-
bundle exec appraisal ar-6.1 rake test
79-
bundle exec appraisal ar-7.0 rake test
80-
bundle exec appraisal ar-7.1 rake test

Appraisals

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
appraise "ar-8.0" do
44
gem "activerecord", "~> 8.0.1"
5-
gem "sqlite3", "~> 2.4.1"
65
end
76

87
appraise "ar-7.2" do
@@ -12,13 +11,3 @@ end
1211
appraise "ar-7.1" do
1312
gem "activerecord", "~> 7.1.1"
1413
end
15-
16-
appraise "ar-7.0" do
17-
gem "activerecord", "~> 7.0.8"
18-
gem "concurrent-ruby", "1.3.4"
19-
end
20-
21-
appraise "ar-6.1" do
22-
gem "activerecord", "~> 6.1.7"
23-
gem "concurrent-ruby", "1.3.4"
24-
end

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### NEXT (?)
2+
3+
- Drop support for Ruby 3.0
4+
- Drop support for ActiveRecord 6.1 - 7.0
5+
16
### 1.3.0 (2024-09-04)
27

38
- Support ActiveRecord 7.2

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33
source 'https://rubygems.org'
44

55
gemspec
6+
7+
gem 'appraisal', '~> 2.5'
8+
gem 'database_cleaner', '~> 2.0'
9+
gem 'minitest', '~> 5.0'
10+
gem 'rake', '~> 13.0'
11+
gem 'sqlite3', '~> 2.6'

blueprinter-activerecord.gemspec

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
1212
spec.description = 'Eager loading and other ActiveRecord helpers for Blueprinter'
1313
spec.homepage = 'https://github.com/procore-oss/blueprinter-activerecord'
1414
spec.license = 'MIT'
15-
spec.required_ruby_version = Gem::Requirement.new('>= 3.0')
15+
spec.required_ruby_version = Gem::Requirement.new('>= 3.1')
1616

1717
spec.metadata['homepage_uri'] = spec.homepage
1818
spec.metadata['source_code_uri'] = 'https://github.com/procore-oss/blueprinter-activerecord'
@@ -23,12 +23,6 @@ Gem::Specification.new do |spec|
2323
spec.files = Dir['lib/**/*']
2424
spec.require_paths = ['lib']
2525

26-
spec.add_runtime_dependency 'activerecord', ['>= 6.0']
26+
spec.add_runtime_dependency 'activerecord', ['>= 7.1']
2727
spec.add_runtime_dependency 'blueprinter', '~> 1.0'
28-
29-
spec.add_development_dependency 'appraisal', '~> 2.5'
30-
spec.add_development_dependency 'database_cleaner', '~> 2.0'
31-
spec.add_development_dependency 'minitest', '~> 5.0'
32-
spec.add_development_dependency 'rake', '~> 13.0'
33-
spec.add_development_dependency 'sqlite3', '~> 1.4'
3428
end

gemfiles/ar_6.1.gemfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

gemfiles/ar_7.0.gemfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

gemfiles/ar_7.1.gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "appraisal", "~> 2.5"
6+
gem "database_cleaner", "~> 2.0"
7+
gem "minitest", "~> 5.0"
8+
gem "rake", "~> 13.0"
9+
gem "sqlite3", "~> 2.6"
510
gem "activerecord", "~> 7.1.1"
611

712
gemspec path: "../"

gemfiles/ar_7.2.gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "appraisal", "~> 2.5"
6+
gem "database_cleaner", "~> 2.0"
7+
gem "minitest", "~> 5.0"
8+
gem "rake", "~> 13.0"
9+
gem "sqlite3", "~> 2.6"
510
gem "activerecord", "~> 7.2.1"
611

712
gemspec path: "../"

gemfiles/ar_8.0.gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "appraisal", "~> 2.5"
6+
gem "database_cleaner", "~> 2.0"
7+
gem "minitest", "~> 5.0"
8+
gem "rake", "~> 13.0"
9+
gem "sqlite3", "~> 2.6"
510
gem "activerecord", "~> 8.0.1"
6-
gem "sqlite3", "~> 2.4.1"
711

812
gemspec path: "../"

0 commit comments

Comments
 (0)