(MAINT) Updates for Bundler 2.0 release

- Updates the bundler dependency in pdk.gemspec to allow 2.x versions - Pins bundler to 1.17.3 for Ruby 2.1.9 in Travis config
puppetlabs · Jan 4, 2019 · bf326ea · bf326ea
1 parent bfaa70d
commit bf326ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,12 @@ script:
   - cat Gemfile.lock
   - bundle list
   - bundle exec rake $CHECK
-before_install: gem install bundler
+before_install:
+  - if [ $BUNDLER_VERSION ]; then
+      gem install -v $BUNDLER_VERSION bundler --no-document;
+    else
+      gem install bundler --no-document;
+    fi
 cache: bundler
 matrix:
   include:
@@ -23,7 +28,7 @@ matrix:
     - rvm: 2.3
       env: CHECK=spec
     - rvm: 2.1.9
-      env: CHECK=spec
+      env: CHECK=spec BUNDLER_VERSION=1.17.3
 branches:
   only:
     - master

diff --git a/pdk.gemspec b/pdk.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.9'
 
-  spec.add_runtime_dependency 'bundler', '~> 1.15'
+  spec.add_runtime_dependency 'bundler', '>= 1.15.0', '< 3.0.0'
   spec.add_runtime_dependency 'cri', '~> 2.10.1'
   spec.add_runtime_dependency 'childprocess', '~> 0.7.1'
   spec.add_runtime_dependency 'gettext-setup', '~> 0.24'