Skip to content

Commit

Permalink
Merge pull request #33 from jrafanie/allow_rails_7
Browse files Browse the repository at this point in the history
Allow rails 7 gems in gemspec
  • Loading branch information
kbrock authored Jan 19, 2024
2 parents 98e86ac + 2af7eaa commit 5672cb0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ jobs:
strategy:
matrix:
ruby-version:
- '2.6'
- '2.7'
- '3.0'
- '3.1'
rails-version:
- '6.0'
- '6.1'
- '7.0'
services:
postgres:
image: manageiq/postgresql:13
Expand Down
20 changes: 12 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in activerecord-id_regions.gemspec
gemspec

case ENV['TEST_RAILS_VERSION']
when "6.0"
gem "activerecord", "~>6.0.4"
gem "activesupport", "~>6.0.4"
when "6.1"
gem "activerecord", "~>6.1.4"
gem "activesupport", "~>6.1.4"
end
minimum_version =
case ENV['TEST_RAILS_VERSION']
when "6.0"
"~>6.0.4"
when "7.0"
"~>7.0.8"
else
"~>6.1.4"
end

gem "activerecord", minimum_version
gem "activesupport", minimum_version
4 changes: 2 additions & 2 deletions activerecord-id_regions.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "activerecord", ">= 5.0", "< 7.0"
spec.add_dependency "activesupport", ">= 5.0", "< 7.0"
spec.add_dependency "activerecord", ">= 5.0", "<7.1"
spec.add_dependency "activesupport", ">= 5.0", "<7.1"
spec.add_dependency "pg"

spec.add_development_dependency "bundler"
Expand Down

0 comments on commit 5672cb0

Please sign in to comment.