Skip to content

Commit 27e4898

Browse files
gingermusketeergingermusketeer
authored
Merge pull request #95 from jrmhaig/rails_6_support
Test for Active Record 6.0 and 6.1
2 parents 4c25792 + db60b47 commit 27e4898

14 files changed

+238
-7
lines changed

‎.travis.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,108 @@ rvm:
33
- 2.2
44
- 2.3
55
- 2.4
6+
- 2.5
7+
- 2.6
8+
- 2.7
9+
- 3.0
610
- ruby-head
711
- jruby
812
gemfile:
913
- gemfiles/activerecord_4.2.gemfile
1014
- gemfiles/activerecord_5.0.gemfile
1115
- gemfiles/activerecord_5.1.gemfile
1216
- gemfiles/activerecord_5.2.gemfile
17+
- gemfiles/activerecord_6.0.gemfile
18+
- gemfiles/activerecord_6.1.gemfile
19+
- gemfiles/jruby_activerecord_6.1.gemfile
1320
- gemfiles/activerecord_head.gemfile
21+
- gemfiles/jruby_activerecord_head.gemfile
1422
matrix:
1523
allow_failures:
1624
- rvm: ruby-head
1725
- rvm: jruby
26+
# These may work if there is a new version of sqlite3 1.3.x supporting
27+
# Ruby 3.0
28+
- rvm: 3.0
29+
gemfile: gemfiles/activerecord_5.0.gemfile
30+
- rvm: 3.0
31+
gemfile: gemfiles/activerecord_5.1.gemfile
32+
- rvm: 3.0
33+
gemfile: gemfiles/activerecord_5.2.gemfile
34+
exclude:
35+
- rvm: 2.2
36+
gemfile: gemfiles/activerecord_6.0.gemfile
37+
- rvm: 2.2
38+
gemfile: gemfiles/activerecord_6.1.gemfile
39+
- rvm: 2.2
40+
gemfile: gemfiles/activerecord_head.gemfile
41+
- rvm: 2.2
42+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
43+
- rvm: 2.2
44+
gemfile: gemfiles/jruby_activerecord_head.gemfile
45+
- rvm: 2.3
46+
gemfile: gemfiles/activerecord_6.0.gemfile
47+
- rvm: 2.3
48+
gemfile: gemfiles/activerecord_6.1.gemfile
49+
- rvm: 2.3
50+
gemfile: gemfiles/activerecord_head.gemfile
51+
- rvm: 2.3
52+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
53+
- rvm: 2.3
54+
gemfile: gemfiles/jruby_activerecord_head.gemfile
55+
- rvm: 2.4
56+
gemfile: gemfiles/activerecord_6.0.gemfile
57+
- rvm: 2.4
58+
gemfile: gemfiles/activerecord_6.1.gemfile
59+
- rvm: 2.4
60+
gemfile: gemfiles/activerecord_head.gemfile
61+
- rvm: 2.4
62+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
63+
- rvm: 2.4
64+
gemfile: gemfiles/jruby_activerecord_head.gemfile
65+
- rvm: 2.5
66+
gemfile: gemfiles/activerecord_head.gemfile
67+
- rvm: 2.5
68+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
69+
- rvm: 2.5
70+
gemfile: gemfiles/jruby_activerecord_head.gemfile
71+
- rvm: 2.6
72+
gemfile: gemfiles/activerecord_head.gemfile
73+
- rvm: 2.6
74+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
75+
- rvm: 2.6
76+
gemfile: gemfiles/jruby_activerecord_head.gemfile
77+
- rvm: 2.7
78+
gemfile: gemfiles/activerecord_4.2.gemfile
79+
- rvm: 2.7
80+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
81+
- rvm: 2.7
82+
gemfile: gemfiles/jruby_activerecord_head.gemfile
83+
- rvm: 3.0
84+
gemfile: gemfiles/activerecord_4.2.gemfile
85+
- rvm: 3.0
86+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
87+
- rvm: 3.0
88+
gemfile: gemfiles/jruby_activerecord_head.gemfile
89+
- rvm: ruby-head
90+
gemfile: gemfiles/activerecord_4.2.gemfile
91+
- rvm: ruby-head
92+
gemfile: gemfiles/jruby_activerecord_6.1.gemfile
93+
- rvm: ruby-head
94+
gemfile: gemfiles/jruby_activerecord_head.gemfile
95+
- rvm: jruby
96+
gemfile: gemfiles/activerecord_4.2.gemfile
97+
- rvm: jruby
98+
gemfile: gemfiles/activerecord_5.0.gemfile
99+
- rvm: jruby
100+
gemfile: gemfiles/activerecord_5.1.gemfile
101+
- rvm: jruby
102+
gemfile: gemfiles/activerecord_5.2.gemfile
103+
- rvm: jruby
104+
gemfile: gemfiles/activerecord_6.0.gemfile
105+
- rvm: jruby
106+
gemfile: gemfiles/activerecord_6.1.gemfile
107+
- rvm: jruby
108+
gemfile: gemfiles/activerecord_head.gemfile
18109
bundler_args: --without local_development
19110
before_install: gem install bundler -v 1.17.3

‎Appraisals‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,76 @@
11
appraise 'activerecord-4.2' do
22
gem 'activerecord', '~> 4.2.0'
3+
group :development, :test do
4+
gem "sqlite3", "~> 1.3.0"
5+
end
36
end
47

58
appraise 'activerecord-5.0' do
69
gem 'activerecord', '~> 5.0.0'
10+
group :development, :test do
11+
gem "sqlite3", "~> 1.3.0"
12+
end
713
end
814

915
appraise 'activerecord-5.1' do
1016
gem 'activerecord', '~> 5.1.0'
17+
group :development, :test do
18+
gem "sqlite3", "~> 1.3.0"
19+
end
1120
end
1221

1322
appraise 'activerecord-5.2' do
1423
gem 'activerecord', '~> 5.2.0'
24+
group :development, :test do
25+
gem "sqlite3", "~> 1.3.0"
26+
end
27+
end
28+
29+
appraise 'activerecord-6.0' do
30+
gem 'activerecord', '~> 6.0.0'
31+
group :development, :test do
32+
gem "sqlite3", "~> 1.4.0"
33+
end
34+
end
35+
36+
appraise 'activerecord-6.1' do
37+
gem 'activerecord', '~> 6.1.0'
38+
group :development, :test do
39+
gem "sqlite3", "~> 1.4.0"
40+
end
41+
end
42+
43+
appraise 'jruby-activerecord-6.1' do
44+
gem 'activerecord', '~> 6.1.0'
45+
group :development, :test do
46+
gem 'activerecord-jdbc-adapter', '~> 61.0'
47+
gem 'activerecord-jdbcsqlite3-adapter', '~> 61.0'
48+
end
1549
end
1650

1751
appraise 'activerecord-head' do
1852
git 'git://github.com/rails/arel.git' do
1953
gem 'arel'
2054
end
21-
git 'git://github.com/rails/rails.git' do
55+
git 'git://github.com/rails/rails.git', branch: 'main' do
2256
gem 'activerecord'
2357
end
58+
group :development, :test do
59+
gem "sqlite3", "~> 1.4.0"
60+
end
61+
end
62+
63+
appraise 'jruby-activerecord-head' do
64+
git 'git://github.com/rails/arel.git' do
65+
gem 'arel'
66+
end
67+
git 'git://github.com/rails/rails.git', branch: 'main' do
68+
gem 'activerecord'
69+
end
70+
group :development, :test do
71+
git 'git://github.com/jruby/activerecord-jdbc-adapter' do
72+
gem 'activerecord-jdbc-adapter'
73+
gem 'activerecord-jdbcsqlite3-adapter', glob: 'activerecord-jdbcsqlite3-adapter/activerecord-jdbcsqlite3-adapter.gemspec'
74+
end
75+
end
2476
end

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This gem is named "Amoeba" because amoebas are (small life forms that are) good
1616

1717
An ActiveRecord extension gem to allow the duplication of associated child record objects when duplicating an active record model.
1818

19-
Rails 4.x, 5.0, 5.1, 5.2 compatible.
19+
Rails 4.x, 5.0, 5.1, 5.2, 6.0, 6.1 compatible.
2020

2121
### Features
2222

‎amoeba.gemspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ EOF
2929
s.add_development_dependency 'rspec', '>= 3.0.0'
3030

3131
if RUBY_PLATFORM == 'java'
32-
s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.3.2'
33-
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.2'
32+
s.add_development_dependency 'activerecord-jdbc-adapter', '~> 61.0'
33+
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 61.0'
3434
else
35-
s.add_development_dependency 'sqlite3', '>= 1.3', '< 1.4'
35+
s.add_development_dependency 'sqlite3', '>= 1.3'
3636
end
3737

3838
s.add_dependency 'activerecord', '>= 4.2.0'

‎gemfiles/activerecord_4.2.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "activerecord", "~> 4.2.0"
77
group :development, :test do
88
gem "rake"
99
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.3.0"
1011
end
1112

1213
group :local_development do

‎gemfiles/activerecord_5.0.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "activerecord", "~> 5.0.0"
77
group :development, :test do
88
gem "rake"
99
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.3.0"
1011
end
1112

1213
group :local_development do

‎gemfiles/activerecord_5.1.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "activerecord", "~> 5.1.0"
77
group :development, :test do
88
gem "rake"
99
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.3.0"
1011
end
1112

1213
group :local_development do

‎gemfiles/activerecord_5.2.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "activerecord", "~> 5.2.0"
77
group :development, :test do
88
gem "rake"
99
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.3.0"
1011
end
1112

1213
group :local_development do

‎gemfiles/activerecord_6.0.gemfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "activerecord", "~> 6.0.0"
6+
7+
group :development, :test do
8+
gem "rake"
9+
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.4.0"
11+
end
12+
13+
group :local_development do
14+
gem "pry"
15+
gem "appraisal"
16+
end
17+
18+
gemspec path: "../"

‎gemfiles/activerecord_6.1.gemfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "activerecord", "~> 6.1.0"
6+
7+
group :development, :test do
8+
gem "rake"
9+
gem "coveralls", require: false
10+
gem "sqlite3", "~> 1.4.0"
11+
end
12+
13+
group :local_development do
14+
gem "pry"
15+
gem "appraisal"
16+
end
17+
18+
gemspec path: "../"

0 commit comments

Comments
 (0)