From ed9fc77a093e6876ec8cdd6140f434bad41ce19e Mon Sep 17 00:00:00 2001
From: Raimundo Herrera <rjherrera@uc.cl>
Date: Mon, 27 Jan 2020 15:07:02 -0300
Subject: [PATCH 1/3] refactor(gemspec): sort dependencies alphabetically

---
 potassium.gemspec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/potassium.gemspec b/potassium.gemspec
index b6bc46c1..31493ae7 100644
--- a/potassium.gemspec
+++ b/potassium.gemspec
@@ -19,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "pry", "~> 0.10.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4.0"
-  spec.add_development_dependency "pry", "~> 0.10.3"
   spec.add_development_dependency "rubocop", Potassium::RUBOCOP_VERSION
   spec.add_development_dependency "rubocop-rspec"
-  spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
+  spec.add_runtime_dependency "gems", "~> 0.8"
   spec.add_runtime_dependency "gli", "~> 2.12.2"
   spec.add_runtime_dependency "inquirer", "~> 0.2"
-  spec.add_runtime_dependency "gems", "~> 0.8"
-  spec.add_runtime_dependency "semantic", "~> 1.4"
   spec.add_runtime_dependency "levenshtein", "~> 0.2"
+  spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
+  spec.add_runtime_dependency "semantic", "~> 1.4"
 end

From 643192b3951773ebe20619f6be3c34fa40647d80 Mon Sep 17 00:00:00 2001
From: Raimundo Herrera <rjherrera@uc.cl>
Date: Tue, 28 Jan 2020 15:31:29 -0300
Subject: [PATCH 2/3] 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..33395bb4 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.0.2
     - 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"

From fe3ad75bd233028494cb42e80b4b62eee3955c7d Mon Sep 17 00:00:00 2001
From: Raimundo Herrera <rjherrera@uc.cl>
Date: Tue, 28 Jan 2020 15:32:10 -0300
Subject: [PATCH 3/3] fix(ci): avoid restoring cache due to unexpected errors

---
 .circleci/config.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33395bb4..7ecd7ca3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,19 +12,9 @@ jobs:
     - checkout
     - setup_remote_docker
 
-    - run: sudo chown -R circleci /usr/local/bundle
-    - restore_cache:
-        keys:
-        - potassium-bundle-{{ .Branch }}-
-        - potassium-bundle-master-
-        - potassium-bundle-
     - run: gem install bundler:2.0.2
     - run: bundle install --jobs=4 --retry=3
     - run: gem install hound-cli
-    - save_cache:
-        key: potassium-bundle-{{ .Branch }}-{{ epoch }}
-        paths:
-        - /usr/local/bundle
     - run:
         command: bundle exec rspec --color --require spec_helper --format=doc --format progress $(circleci tests glob spec/**/*_spec.rb | circleci tests split)
         environment: