Skip to content

Commit

Permalink
Update activesupport requirement from >= 5.1, < 7.1 to >= 6.0, < 7.2
Browse files Browse the repository at this point in the history
Updates the requirements on [activesupport](https://github.com/rails/rails) to permit the latest version.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.1.0/activesupport/CHANGELOG.md)
- [Commits](rails/rails@v5.1.0...v6.1.7.6)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and ojab committed Oct 7, 2023
1 parent ae403a9 commit b774200
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- { ruby: '2.7', rails: '6.1' }
- { ruby: '3.0', rails: '7.0' }
- { ruby: '3.1', rails: '7.0' }
- { ruby: '3.2', rails: '7.0' }
- { ruby: '3.2', rails: '7.1' }
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails.${{ matrix.rails }}.gemfile

Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%w[5.1 5.2 6.0 6.1 7.0].each do |version|
%w[6.0 6.1 7.0 7.1].each do |version|
appraise "rails.#{version}" do
gem 'actionpack', "~> #{version}.0"
gem 'activesupport', "~> #{version}.0"
Expand Down
10 changes: 0 additions & 10 deletions gemfiles/rails.5.2.gemfile

This file was deleted.

6 changes: 3 additions & 3 deletions gemfiles/rails.5.1.gemfile → gemfiles/rails.7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
source "https://rubygems.org"

gem "granite-form", git: "https://github.com/toptal/granite-form.git"
gem "actionpack", "~> 5.1.0"
gem "activesupport", "~> 5.1.0"
gem "activerecord", "~> 5.1.0"
gem "actionpack", "~> 7.1.0"
gem "activesupport", "~> 7.1.0"
gem "activerecord", "~> 7.1.0"

gemspec path: "../"
8 changes: 4 additions & 4 deletions granite.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Gem::Specification.new do |s|
s.license = 'MIT'
s.required_ruby_version = '>= 2.5'

s.add_runtime_dependency 'actionpack', '>= 5.1', '< 7.1'
s.add_runtime_dependency 'actionpack', '>= 6.0', '< 7.2'
s.add_runtime_dependency 'granite-form', '>= 0.3.0'
s.add_runtime_dependency 'activesupport', '>= 5.1', '< 7.1'
s.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.2'
s.add_runtime_dependency 'memoist', '~> 0.16'
s.add_runtime_dependency 'ruby2_keywords', '~> 0.0.5'

Expand All @@ -27,11 +27,11 @@ Gem::Specification.new do |s|
s.add_development_dependency 'fuubar', '~> 2.0'
s.add_development_dependency 'pg', '< 2'
s.add_development_dependency 'pry-byebug'
s.add_development_dependency 'rspec', '~> 3.6'
s.add_development_dependency 'rspec', '~> 3.12'
s.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
s.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
s.add_development_dependency 'rspec-its', '~> 1.2 '
s.add_development_dependency 'rspec-rails', '~> 3.6'
s.add_development_dependency 'rspec-rails', '~> 5.0'
s.add_development_dependency 'rspec_junit_formatter', '~> 0.2'
s.add_development_dependency 'rubocop', '~> 1.0'
s.add_development_dependency 'rubocop-rails', '~> 2.13'
Expand Down
12 changes: 10 additions & 2 deletions spec/lib/generators/granite_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
require 'rails/generators'
require 'rails/generators/testing/behaviour'
if Rails.version > '7.1'
require 'rails/generators/testing/behavior'
else
require 'rails/generators/testing/behaviour'
end
require_relative '../../../lib/generators/granite_generator'

RSpec.describe GraniteGenerator do
include RSpec::Rails::RailsExampleGroup
include Rails::Generators::Testing::Behaviour
if Rails.version > '7.1'
include Rails::Generators::Testing::Behavior
else
include Rails::Generators::Testing::Behaviour
end
include FileUtils

tests described_class
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
require 'rspec/matchers/fail_matchers'
require 'simplecov'
SimpleCov.start do
minimum_coverage 99.74
minimum_coverage 99.73
end

require 'granite'
Expand Down

0 comments on commit b774200

Please sign in to comment.