From 7c45b94d417eb97276c6f9e4960a5405dbb42ab4 Mon Sep 17 00:00:00 2001 From: Raimundo Herrera Date: Tue, 28 Jan 2020 15:31:29 -0300 Subject: [PATCH] feat(bundler): update bundler to 2.0 closes #249 --- .circleci/config.yml | 1 + CHANGELOG.md | 1 + potassium.gemspec | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 95424490..1c0695f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: - potassium-bundle-{{ .Branch }}- - potassium-bundle-master- - potassium-bundle- + - run: gem install bundler:2.1.4 - run: bundle install --jobs=4 --retry=3 - run: gem install hound-cli - save_cache: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5331916b..16f5c3fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Features: - Update ActiveAdmin to 2.6 [#246](https://github.com/platanus/potassium/pull/246) + - Update bundler to 2.0 [#250](https://github.com/platanus/potassium/pull/250) Fix: - Correctly use cache for bundle dependencies in CircleCi build [#244](https://github.com/platanus/potassium/pull/244) diff --git a/potassium.gemspec b/potassium.gemspec index 31493ae7..9da9b194 100644 --- a/potassium.gemspec +++ b/potassium.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.7" + spec.add_development_dependency "bundler", "~> 2.0" spec.add_development_dependency "pry", "~> 0.10.3" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.4.0"