Skip to content

Commit f4eec3c

Browse files
doitsMaicolBen
authored andcommitted
allow devise < 4.7 (#1269)
* allow devise 4.6 * fix rails by using sqlite3 ~> 1.3 needed until rails/rails#35154 is released (only for newer versions then) * test against latest ruby versions * and update ruby on travis, too! * hopefully install bundler < 2 for rails 4.2 in CI * remove sqlite from gemfile * see if removing slite3 version from here works, too
1 parent 29e129b commit f4eec3c

7 files changed

Lines changed: 22 additions & 18 deletions

File tree

.travis.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ bundler_args: --without development
88
rvm:
99
- 2.3.8
1010
- 2.4.5
11-
- 2.5.3
12-
- 2.6.0
11+
- 2.5.5
12+
- 2.6.2
1313

1414
gemfile:
1515
- gemfiles/rails_4_2.gemfile
@@ -36,17 +36,17 @@ matrix:
3636
- rvm: 2.4.5
3737
gemfile: gemfiles/rails_5_1_mongoid_7.gemfile
3838
env: DEVISE_TOKEN_AUTH_ORM=mongoid
39-
- rvm: 2.5.3
39+
- rvm: 2.5.5
4040
gemfile: gemfiles/rails_5_2_mongoid_6.gemfile
4141
env: DEVISE_TOKEN_AUTH_ORM=mongoid
42-
- rvm: 2.5.3
42+
- rvm: 2.5.5
4343
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
4444
env: DEVISE_TOKEN_AUTH_ORM=mongoid
45-
- rvm: 2.6.0
45+
- rvm: 2.6.2
4646
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
4747
env: DEVISE_TOKEN_AUTH_ORM=mongoid
4848
- name: Code Climate Test Coverage
49-
rmv: 2.5.3
49+
rmv: 2.5.5
5050
env:
5151
- CC_TEST_REPORTER_ID=44d7688de8e1b567b4af25ec5083c2cc0a355ab911192a7cbefd1ea25b2ffd3d
5252
- GEMFILE_AR=gemfiles/rails_5_1.gemfile
@@ -70,10 +70,14 @@ matrix:
7070
./cc-test-reporter upload-coverage;
7171
fi
7272
exclude:
73-
- rvm: 2.6.0
73+
- rvm: 2.6.2
7474
gemfile: gemfiles/rails_4_2.gemfile
7575
fast_finish: true
7676

77+
before_install:
78+
- "[[ $BUNDLE_GEMFILE == *rails_4_2* ]] && gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true"
79+
- "[[ $BUNDLE_GEMFILE == *rails_4_2* ]] && gem install bundler -v '< 2' || true"
80+
7781
before_script:
7882
- if [[ $DB == "mysql" ]]; then mysql -e 'create database devise_token_auth_test'; fi
7983
- if [[ $DB == "postgresql" ]]; then psql -c 'create database devise_token_auth_test' -U postgres; fi

Appraisals

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
appraise "rails-#{rails[:name]}" do
77
gem 'rails', "~> #{rails[:version]}"
88

9-
gem 'sqlite3', '~> 1.3'
9+
gem 'sqlite3', '~> 1.3.6'
1010
gem 'mysql2', '~> 0.4.10'
1111
gem 'pg', '~> 0.21'
1212
end
@@ -20,7 +20,7 @@ end
2020
appraise "rails-#{rails[:name]}" do
2121
gem 'rails', "~> #{rails[:version]}"
2222

23-
gem 'sqlite3'
23+
gem 'sqlite3', '~> 1.3.6'
2424
gem 'mysql2'
2525
gem 'pg'
2626
end
@@ -30,9 +30,9 @@ end
3030
{ name: '4-2', ruby: '2.3.8', rails: '4.2', mongoid: '5.4' },
3131
{ name: '5-1', ruby: '2.3.8', rails: '5.1', mongoid: '6.4' },
3232
{ name: '5-1', ruby: '2.4.5', rails: '5.1', mongoid: '7.0' },
33-
{ name: '5-2', ruby: '2.5.3', rails: '5.2', mongoid: '6.4' },
34-
{ name: '5-2', ruby: '2.5.3', rails: '5.2', mongoid: '7.0' },
35-
{ name: '5-2', ruby: '2.6.0', rails: '5.2', mongoid: '7.0' }
33+
{ name: '5-2', ruby: '2.5.5', rails: '5.2', mongoid: '6.4' },
34+
{ name: '5-2', ruby: '2.5.5', rails: '5.2', mongoid: '7.0' },
35+
{ name: '5-2', ruby: '2.6.2', rails: '5.2', mongoid: '7.0' }
3636
].each do |set|
3737
appraise "rails-#{set[:name]}-mongoid-#{set[:mongoid][0]}" do
3838
gem 'rails', "~> #{set[:rails]}"

devise_token_auth.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
2323
s.required_ruby_version = ">= 2.2.0"
2424

2525
s.add_dependency 'rails', '>= 4.2.0', '< 6'
26-
s.add_dependency 'devise', '> 3.5.2', '< 4.6'
26+
s.add_dependency 'devise', '> 3.5.2', '< 4.7'
2727

2828
s.add_development_dependency 'appraisal'
29-
s.add_development_dependency 'sqlite3', '~> 1.3'
29+
s.add_development_dependency 'sqlite3', '~> 1.3.6'
3030
s.add_development_dependency 'pg'
3131
s.add_development_dependency 'mysql2'
3232
s.add_development_dependency 'mongoid', '>= 4', '< 8'

gemfiles/rails_4_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 4.2"
6-
gem "sqlite3", "~> 1.3"
6+
gem "sqlite3", "~> 1.3.6"
77
gem "mysql2", "~> 0.4.10"
88
gem "pg", "~> 0.21"
99

gemfiles/rails_5_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 5.0"
6-
gem "sqlite3"
6+
gem "sqlite3", "~> 1.3.6"
77
gem "mysql2"
88
gem "pg"
99

gemfiles/rails_5_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 5.1"
6-
gem "sqlite3"
6+
gem "sqlite3", "~> 1.3.6"
77
gem "mysql2"
88
gem "pg"
99

gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 5.2"
6-
gem "sqlite3"
6+
gem "sqlite3", "~> 1.3.6"
77
gem "mysql2"
88
gem "pg"
99

0 commit comments

Comments
 (0)