Skip to content

Commit

Permalink
drop support for ruby 2.3 + 2.4 (#549)
Browse files Browse the repository at this point in the history
* drop support for ruby 2.3 + 2.4

* tidy local gemfile, remove pin on pye-byebug
  • Loading branch information
thomas-mcdonald committed Jun 29, 2020
1 parent 03dcfd2 commit 332fbd2
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 73 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Expand Up @@ -14,8 +14,6 @@ rvm:
- 2.7.0
- 2.6.3
- 2.5.5
- 2.4.6
- 2.3.8

gemfile:
- gemfiles/activerecord_4.gemfile
Expand All @@ -37,10 +35,6 @@ matrix:
env: ADAPTER=mongoid
- gemfile: gemfiles/activerecord_6.gemfile
env: ADAPTER=mongoid
- gemfile: gemfiles/activerecord_6.gemfile
rvm: 2.4.6
- gemfile: gemfiles/activerecord_6.gemfile
rvm: 2.3.8
- gemfile: gemfiles/mongoid_5.gemfile
env: ADAPTER=active_record
- gemfile: gemfiles/mongoid_6.gemfile
Expand Down
12 changes: 0 additions & 12 deletions Appraisals
Expand Up @@ -29,12 +29,6 @@ appraise 'activerecord-5' do
gem "actionpack", "~> 5.2.4"
gem "activemodel", "~> 5.2.4"
gem "railties", "~> 5.2.4"

gem 'rspec-rails' , github: 'rspec/rspec-rails'
gem 'rspec-core' , github: 'rspec/rspec-core'
gem 'rspec-expectations', github: 'rspec/rspec-expectations'
gem 'rspec-mocks' , github: 'rspec/rspec-mocks'
gem 'rspec-support' , github: 'rspec/rspec-support'
end

appraise 'activerecord-6' do
Expand All @@ -45,10 +39,4 @@ appraise 'activerecord-6' do
gem "actionpack", ">= 6.0.0"
gem "activemodel", ">= 6.0.0"
gem "railties", ">= 6.0.0"

gem 'rspec-rails' , github: 'rspec/rspec-rails'
gem 'rspec-core' , github: 'rspec/rspec-core'
gem 'rspec-expectations', github: 'rspec/rspec-expectations'
gem 'rspec-mocks' , github: 'rspec/rspec-mocks'
gem 'rspec-support' , github: 'rspec/rspec-support'
end
14 changes: 7 additions & 7 deletions Gemfile
@@ -1,15 +1,15 @@
source "https://rubygems.org"

group :test do
gem 'appraisal'
gem 'coveralls', :require => false
gem 'codeclimate-test-reporter', require: nil
gem 'coveralls', require: false
gem 'database_cleaner', '~> 1.6.2'
gem 'its'
gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3
gem 'byebug'
gem 'pry-byebug', '< 3.8.0'
gem 'test-unit' # Implicitly loaded by ammeter
gem 'database_cleaner', '~> 1.6.2'
gem 'codeclimate-test-reporter', :require => nil

gem 'byebug'
gem 'pry'
gem 'pry-byebug'
end

gemspec
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -46,7 +46,7 @@ rails g rolify Role User
rails g rolify:role Role User
```

The generator will create your Role model, add a migration file, and update your User class with new class methods.
The generator will create your Role model, add a migration file, and update your User class with new class methods.

### 2. Run the migration (only required when using ActiveRecord)

Expand Down
11 changes: 5 additions & 6 deletions gemfiles/activerecord_4.gemfile
Expand Up @@ -7,15 +7,14 @@ gem "activerecord", "~> 4.2.11", require: "active_record"
gem "bigdecimal", "1.4.2"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
16 changes: 5 additions & 11 deletions gemfiles/activerecord_5.gemfile
Expand Up @@ -7,22 +7,16 @@ gem "activerecord", "~> 5.2.4", require: "active_record"
gem "actionpack", "~> 5.2.4"
gem "activemodel", "~> 5.2.4"
gem "railties", "~> 5.2.4"
gem "rspec-rails", github: "rspec/rspec-rails"
gem "rspec-core", github: "rspec/rspec-core"
gem "rspec-expectations", github: "rspec/rspec-expectations"
gem "rspec-mocks", github: "rspec/rspec-mocks"
gem "rspec-support", github: "rspec/rspec-support"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
16 changes: 5 additions & 11 deletions gemfiles/activerecord_6.gemfile
Expand Up @@ -7,22 +7,16 @@ gem "activerecord", ">= 6.0.0", require: "active_record"
gem "actionpack", ">= 6.0.0"
gem "activemodel", ">= 6.0.0"
gem "railties", ">= 6.0.0"
gem "rspec-rails", github: "rspec/rspec-rails"
gem "rspec-core", github: "rspec/rspec-core"
gem "rspec-expectations", github: "rspec/rspec-expectations"
gem "rspec-mocks", github: "rspec/rspec-mocks"
gem "rspec-support", github: "rspec/rspec-support"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
11 changes: 5 additions & 6 deletions gemfiles/mongoid_5.gemfile
Expand Up @@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1"
gem "bigdecimal", "1.4.2"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
11 changes: 5 additions & 6 deletions gemfiles/mongoid_6.gemfile
Expand Up @@ -6,15 +6,14 @@ gem "mongoid", "~> 6"
gem "bson_ext", "1.5.1"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
11 changes: 5 additions & 6 deletions gemfiles/mongoid_7.gemfile
Expand Up @@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1"
gem "railties", "5.2.4.1"

group :test do
gem "appraisal"
gem "codeclimate-test-reporter", require: nil
gem "coveralls", require: false
gem "database_cleaner", "~> 1.6.2"
gem "its"
gem "pry", "< 0.13.0"
gem "byebug"
gem "pry-byebug", "< 3.8.0"
gem "test-unit"
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
gem "byebug"
gem "pry"
gem "pry-byebug"
end

gemspec path: "../"
3 changes: 2 additions & 1 deletion rolify.gemspec
Expand Up @@ -26,9 +26,10 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib']

s.required_ruby_version = '>= 2.3'
s.required_ruby_version = '>= 2.5'

s.add_development_dependency 'ammeter', '~> 1.1' # Spec generator
s.add_development_dependency 'appraisal', '~> 2.0'
s.add_development_dependency 'bundler', '~> 2.0' # packaging feature
s.add_development_dependency 'rake', '~> 12.3' # Tasks manager
s.add_development_dependency 'rspec-rails', '~> 3.8'
Expand Down

0 comments on commit 332fbd2

Please sign in to comment.