Skip to content

Commit

Permalink
Support rails 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinier de Lange committed May 27, 2016
1 parent d0e6f32 commit 06ce7fe
Show file tree
Hide file tree
Showing 13 changed files with 213 additions and 105 deletions.
17 changes: 14 additions & 3 deletions .travis.yml
View file
Expand Up @@ -3,8 +3,8 @@ rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- 2.1
- 2.2
- 2.1.5
- 2.2.2
- 2.3.0

gemfile:
Expand All @@ -13,6 +13,7 @@ gemfile:
- gemfiles/4.0.gemfile
- gemfiles/4.1.gemfile
- gemfiles/4.2.gemfile
- gemfiles/5.0.gemfile

matrix:
exclude:
Expand All @@ -22,13 +23,23 @@ matrix:
gemfile: gemfiles/4.1.gemfile
- rvm: 1.8.7
gemfile: gemfiles/4.2.gemfile
- rvm: 1.8.7
gemfile: gemfiles/5.0.gemfile
- rvm: 1.9.2
gemfile: gemfiles/4.0.gemfile
- rvm: 1.9.2
gemfile: gemfiles/4.1.gemfile
- rvm: 1.9.2
gemfile: gemfiles/4.2.gemfile
- rvm: 2.2
- rvm: 1.9.2
gemfile: gemfiles/5.0.gemfile
- rvm: 1.9.3
gemfile: gemfiles/5.0.gemfile
- rvm: 2.0.0
gemfile: gemfiles/5.0.gemfile
- rvm: 2.1
gemfile: gemfiles/5.0.gemfile
- rvm: 2.2.2
gemfile: gemfiles/3.1.gemfile
- rvm: 2.3.0
gemfile: gemfiles/3.1.gemfile
5 changes: 5 additions & 0 deletions Appraisals
View file
Expand Up @@ -19,4 +19,9 @@ end
appraise '4.2' do
gem 'activerecord', '~> 4.2.3'
gem 'i18n', '~> 0.7.0'
end

appraise '5.0' do
gem 'activerecord', '~> 5.0.0.rc1'
gem 'i18n', '~> 0.7.0'
end
41 changes: 21 additions & 20 deletions Gemfile.lock
View file
@@ -1,14 +1,14 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (4.1.14)
activesupport (= 4.1.14)
activemodel (4.1.15)
activesupport (= 4.1.15)
builder (~> 3.1)
activerecord (4.1.14)
activemodel (= 4.1.14)
activesupport (= 4.1.14)
activerecord (4.1.15)
activemodel (= 4.1.15)
activesupport (= 4.1.15)
arel (~> 5.0.0)
activesupport (4.1.14)
activesupport (4.1.15)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -25,18 +25,17 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
git (1.2.9.1)
github_api (0.13.1)
git (1.3.0)
github_api (0.14.0)
addressable (~> 2.4.0)
descendants_tracker (~> 0.0.4)
faraday (~> 0.8, < 0.10)
hashie (>= 3.4)
multi_json (>= 1.7.5, < 2.0)
oauth2
hashie (3.4.3)
hashie (3.4.4)
highline (1.6.21)
i18n (0.6.11)
jeweler (2.0.1)
jeweler (2.1.1)
builder
bundler (>= 1.0)
git (>= 1.2.5)
Expand All @@ -45,23 +44,25 @@ GEM
nokogiri (>= 1.5.10)
rake
rdoc
semver
json (1.8.3)
jwt (1.5.2)
minitest (5.8.3)
multi_json (1.11.2)
jwt (1.5.1)
minitest (5.9.0)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.5.11)
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)
rack (1.6.4)
rake (10.4.2)
rdoc (4.2.1)
rake (11.1.2)
rdoc (4.2.2)
json (~> 1.4)
semver (1.0.1)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
Expand All @@ -83,4 +84,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.10.6
1.11.2
6 changes: 3 additions & 3 deletions deep_cloneable.gemspec
View file
Expand Up @@ -56,12 +56,12 @@ Gem::Specification.new do |s|
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord>, ["< 5.0.0", ">= 3.1.0"])
s.add_runtime_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
else
s.add_dependency(%q<activerecord>, ["< 5.0.0", ">= 3.1.0"])
s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
end
else
s.add_dependency(%q<activerecord>, ["< 5.0.0", ">= 3.1.0"])
s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
end
end

20 changes: 10 additions & 10 deletions gemfiles/3.1.gemfile.lock
View file
Expand Up @@ -29,7 +29,7 @@ GEM
multi_json (~> 1.4)
nokogiri (~> 1.5.2)
oauth2
hashie (3.4.3)
hashie (3.4.4)
highline (1.6.21)
i18n (0.6.11)
jeweler (2.0.1)
Expand All @@ -42,25 +42,25 @@ GEM
rake
rdoc
json (1.8.3)
jwt (1.5.2)
minitest (5.8.3)
multi_json (1.11.2)
jwt (1.5.1)
minitest (5.9.0)
multi_json (1.12.0)
multi_xml (0.5.5)
multipart-post (1.2.0)
nokogiri (1.5.11)
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)
rack (1.6.4)
rake (10.4.2)
rake (11.1.2)
rdoc (4.2.1)
json (~> 1.4)
sqlite3 (1.3.11)
thor (0.19.1)
tzinfo (0.3.46)
tzinfo (0.3.48)

PLATFORMS
ruby
Expand All @@ -78,4 +78,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.10.6
1.11.2
32 changes: 16 additions & 16 deletions gemfiles/3.2.gemfile.lock
View file
@@ -1,15 +1,15 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (3.2.22)
activesupport (= 3.2.22)
activemodel (3.2.22.1)
activesupport (= 3.2.22.1)
builder (~> 3.0.0)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activerecord (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activesupport (3.2.22)
activesupport (3.2.22.1)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.8)
Expand All @@ -29,7 +29,7 @@ GEM
multi_json (~> 1.4)
nokogiri (~> 1.5.2)
oauth2
hashie (3.4.3)
hashie (3.4.4)
highline (1.6.21)
i18n (0.6.11)
jeweler (2.0.1)
Expand All @@ -42,25 +42,25 @@ GEM
rake
rdoc
json (1.8.3)
jwt (1.5.2)
minitest (5.8.3)
multi_json (1.11.2)
jwt (1.5.1)
minitest (5.9.0)
multi_json (1.12.0)
multi_xml (0.5.5)
multipart-post (1.2.0)
nokogiri (1.5.11)
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)
rack (1.6.4)
rake (10.4.2)
rake (11.1.2)
rdoc (4.2.1)
json (~> 1.4)
sqlite3 (1.3.11)
thor (0.19.1)
tzinfo (0.3.46)
tzinfo (0.3.48)

PLATFORMS
ruby
Expand All @@ -78,4 +78,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.10.6
1.11.2
18 changes: 9 additions & 9 deletions gemfiles/4.0.gemfile.lock
View file
Expand Up @@ -35,7 +35,7 @@ GEM
hashie (>= 3.4)
multi_json (>= 1.7.5, < 2.0)
oauth2
hashie (3.4.3)
hashie (3.4.4)
highline (1.6.21)
i18n (0.6.11)
jeweler (2.0.1)
Expand All @@ -48,26 +48,26 @@ GEM
rake
rdoc
json (1.8.3)
jwt (1.5.2)
jwt (1.5.1)
minitest (4.7.5)
multi_json (1.11.2)
multi_json (1.12.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.5.11)
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)
rack (1.6.4)
rake (10.4.2)
rake (11.1.2)
rdoc (4.2.1)
json (~> 1.4)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (0.3.46)
tzinfo (0.3.48)

PLATFORMS
ruby
Expand All @@ -84,4 +84,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.10.6
1.11.2
30 changes: 15 additions & 15 deletions gemfiles/4.1.gemfile.lock
View file
@@ -1,14 +1,14 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (4.1.14)
activesupport (= 4.1.14)
activemodel (4.1.15)
activesupport (= 4.1.15)
builder (~> 3.1)
activerecord (4.1.14)
activemodel (= 4.1.14)
activesupport (= 4.1.14)
activerecord (4.1.15)
activemodel (= 4.1.15)
activesupport (= 4.1.15)
arel (~> 5.0.0)
activesupport (4.1.14)
activesupport (4.1.15)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -33,7 +33,7 @@ GEM
hashie (>= 3.4)
multi_json (>= 1.7.5, < 2.0)
oauth2
hashie (3.4.3)
hashie (3.4.4)
highline (1.6.21)
i18n (0.6.11)
jeweler (2.0.1)
Expand All @@ -46,20 +46,20 @@ GEM
rake
rdoc
json (1.8.3)
jwt (1.5.2)
minitest (5.8.3)
multi_json (1.11.2)
jwt (1.5.1)
minitest (5.9.0)
multi_json (1.12.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.5.11)
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)
rack (1.6.4)
rake (10.4.2)
rake (11.1.2)
rdoc (4.2.1)
json (~> 1.4)
sqlite3 (1.3.11)
Expand All @@ -83,4 +83,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.10.6
1.11.2

0 comments on commit 06ce7fe

Please sign in to comment.