Skip to content

Commit

Permalink
* Support AR 5.1, drop support for AR 4.0 & ruby 2.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
PikachuEXE committed May 10, 2017
1 parent 8d7f0bf commit ad6376a
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@ language: ruby
cache:
- bundler
rvm:
- 2.1.10
- 2.2.6
- 2.3.3
- 2.4.1
- ruby-head
gemfile:
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
matrix:
fast_finish: true
allow_failures:
- rvm: ruby-head
include:
- rvm: 2.3.3
gemfile: gemfiles/rails_5_0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5_0.gemfile

16 changes: 8 additions & 8 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@

appraise "rails_4_0" do
version = "~> 4.0.12"
gem "activesupport", version
gem "actionpack", version
gem "activerecord", version
gem "railties", version
end

appraise "rails_4_1" do
version = "~> 4.1.8"
gem "activesupport", version
Expand All @@ -30,3 +22,11 @@ appraise "rails_5_0" do
gem "activerecord", version
gem "railties", version
end

appraise "rails_5_1" do
version = "~> 5.1.0"
gem "activesupport", version
gem "actionpack", version
gem "activerecord", version
gem "railties", version
end
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- Nothing
- Add support for AR 5.1.x
- Drop support for AR 4.0.x
- Drop support for Ruby < 2.2

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions active_record_tweaks.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency "activerecord", ">= 4.0.0", "< 5.1.0"
s.add_dependency "activerecord", ">= 4.1.0", "< 6.0.0"

s.add_development_dependency "bundler", ">= 1.0.0"
s.add_development_dependency "rake", ">= 10.0", "<= 13.0"
Expand All @@ -41,7 +41,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "timecop", ">= 0.7.1"
s.add_development_dependency "rubocop", "~> 0.30"

s.required_ruby_version = ">= 2.1.0"
s.required_ruby_version = ">= 2.2.0"

s.required_rubygems_version = ">= 1.4.0"
end
2 changes: 2 additions & 0 deletions gemfiles/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_RETRY: "1"
10 changes: 0 additions & 10 deletions gemfiles/rails_4_0.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_4_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem "actionpack", "~> 4.1.8"
gem "activerecord", "~> 4.1.8"
gem "railties", "~> 4.1.8"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem "actionpack", "~> 4.2.0"
gem "activerecord", "~> 4.2.0"
gem "railties", "~> 4.2.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem "actionpack", "~> 5.0.0"
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"

gemspec :path => "../"
gemspec path: "../"
10 changes: 10 additions & 0 deletions gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activesupport", "~> 5.1.0"
gem "actionpack", "~> 5.1.0"
gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"

gemspec path: "../"

0 comments on commit ad6376a

Please sign in to comment.