Skip to content

Commit d4cf8f0

Browse files
lgebhardtbenebrice
authored andcommitted
Update bundler to 1.17
(cherry picked from commit a51d07f)
1 parent d5ab38c commit d4cf8f0

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.travis.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@ language: ruby
22
sudo: false
33
env:
44
- "RAILS_VERSION=4.2.11"
5-
- "RAILS_VERSION=5.0.7.1"
6-
- "RAILS_VERSION=5.1.6.1"
7-
- "RAILS_VERSION=5.2.2"
8-
- "RAILS_VERSION=master"
5+
- "RAILS_VERSION=5.0.7.2"
6+
- "RAILS_VERSION=5.1.7"
7+
- "RAILS_VERSION=5.2.3"
8+
# - "RAILS_VERSION=6.0.0.beta1"
9+
# - "RAILS_VERSION=master"
910
rvm:
1011
- 2.3.8
11-
- 2.4.5
12-
- 2.5.3
12+
- 2.4.7
13+
- 2.5.6
14+
- 2.6.4
1315
matrix:
1416
allow_failures:
15-
- env: "RAILS_VERSION=master"
17+
- env: "RAILS_VERSION=master"
18+
- env: "RAILS_VERSION=6.0.0.beta1"
19+
exclude:
20+
- rvm: 2.6.4
21+
env: "RAILS_VERSION=4.2.11"
22+
before_install:
23+
- gem install bundler --version 1.17.3

jsonapi-resources.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
spec.require_paths = ['lib']
2020
spec.required_ruby_version = '>= 2.1'
2121

22-
spec.add_development_dependency 'bundler', '~> 1.5'
22+
spec.add_development_dependency 'bundler', '~> 1.17.3'
2323
spec.add_development_dependency 'rake'
2424
spec.add_development_dependency 'minitest'
2525
spec.add_development_dependency 'minitest-spec-rails'

0 commit comments

Comments
 (0)