Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,38 +43,9 @@ jobs:
- name: Installing dependencies
run: |
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
bundle exec appraisal ar-6.1 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.0 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.1 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.2 bundle install --path=vendor/bundle
- name: Run tests
run: |
bundle exec appraisal ar-6.1 rake test
bundle exec appraisal ar-7.0 rake test
bundle exec appraisal ar-7.1 rake test
bundle exec appraisal ar-7.2 rake test

test-3_0:
strategy:
matrix:
os: [ubuntu-latest]
ruby: ["3.0"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Installing dependencies
run: |
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle
bundle exec appraisal ar-6.1 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.0 bundle install --path=vendor/bundle
bundle exec appraisal ar-7.1 bundle install --path=vendor/bundle
- name: Run tests
run: |
bundle exec appraisal ar-6.1 rake test
bundle exec appraisal ar-7.0 rake test
bundle exec appraisal ar-7.1 rake test
11 changes: 0 additions & 11 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

appraise "ar-8.0" do
gem "activerecord", "~> 8.0.1"
gem "sqlite3", "~> 2.4.1"
end

appraise "ar-7.2" do
Expand All @@ -12,13 +11,3 @@ end
appraise "ar-7.1" do
gem "activerecord", "~> 7.1.1"
end

appraise "ar-7.0" do
gem "activerecord", "~> 7.0.8"
gem "concurrent-ruby", "1.3.4"
end

appraise "ar-6.1" do
gem "activerecord", "~> 6.1.7"
gem "concurrent-ruby", "1.3.4"
end
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### NEXT (?)

- Drop support for Ruby 3.0
- Drop support for ActiveRecord 6.1 - 7.0

### 1.3.0 (2024-09-04)

- Support ActiveRecord 7.2
Expand Down
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
source 'https://rubygems.org'

gemspec

gem 'appraisal', '~> 2.5'
gem 'database_cleaner', '~> 2.0'
gem 'minitest', '~> 5.0'
gem 'rake', '~> 13.0'
gem 'sqlite3', '~> 2.6'
10 changes: 2 additions & 8 deletions blueprinter-activerecord.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.description = 'Eager loading and other ActiveRecord helpers for Blueprinter'
spec.homepage = 'https://github.com/procore-oss/blueprinter-activerecord'
spec.license = 'MIT'
spec.required_ruby_version = Gem::Requirement.new('>= 3.0')
spec.required_ruby_version = Gem::Requirement.new('>= 3.1')

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

spec.add_runtime_dependency 'activerecord', ['>= 6.0']
spec.add_runtime_dependency 'activerecord', ['>= 7.1']
spec.add_runtime_dependency 'blueprinter', '~> 1.0'

spec.add_development_dependency 'appraisal', '~> 2.5'
spec.add_development_dependency 'database_cleaner', '~> 2.0'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'sqlite3', '~> 1.4'
end
8 changes: 0 additions & 8 deletions gemfiles/ar_6.1.gemfile

This file was deleted.

8 changes: 0 additions & 8 deletions gemfiles/ar_7.0.gemfile

This file was deleted.

5 changes: 5 additions & 0 deletions gemfiles/ar_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.5"
gem "database_cleaner", "~> 2.0"
gem "minitest", "~> 5.0"
gem "rake", "~> 13.0"
gem "sqlite3", "~> 2.6"
gem "activerecord", "~> 7.1.1"

gemspec path: "../"
5 changes: 5 additions & 0 deletions gemfiles/ar_7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.5"
gem "database_cleaner", "~> 2.0"
gem "minitest", "~> 5.0"
gem "rake", "~> 13.0"
gem "sqlite3", "~> 2.6"
gem "activerecord", "~> 7.2.1"

gemspec path: "../"
6 changes: 5 additions & 1 deletion gemfiles/ar_8.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

source "https://rubygems.org"

gem "appraisal", "~> 2.5"
gem "database_cleaner", "~> 2.0"
gem "minitest", "~> 5.0"
gem "rake", "~> 13.0"
gem "sqlite3", "~> 2.6"
gem "activerecord", "~> 8.0.1"
gem "sqlite3", "~> 2.4.1"

gemspec path: "../"