Merge pull request #6484 from activeadmin/bundler_2_2_0

Use bundler 2.2.0.rc.1
activeadmin · Oct 2, 2020 · 91e4a99 · 91e4a99
2 parents 7b97626 + f308fda
commit 91e4a99
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ version: 2.1
 .install_bundler: &install_bundler
   run:
     name: Install a specific bundler version
-    command: gem install bundler -v 2.1.4
+    command: gem install bundler -v 2.2.0.rc.1
 
 .install_build_deps: &install_build_deps
   run:

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -521,4 +521,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.0.rc.1
diff --git a/gemfiles/rails_52/Gemfile.lock b/gemfiles/rails_52/Gemfile.lock
@@ -423,4 +423,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.0.rc.1
diff --git a/gemfiles/rails_60_turbolinks/Gemfile.lock b/gemfiles/rails_60_turbolinks/Gemfile.lock
@@ -443,4 +443,4 @@ DEPENDENCIES
   turbolinks (~> 5.2)
 
 BUNDLED WITH
-   2.1.4
+   2.2.0.rc.1
diff --git a/gemfiles/rails_60_webpacker/Gemfile.lock b/gemfiles/rails_60_webpacker/Gemfile.lock
@@ -448,4 +448,4 @@ DEPENDENCIES
   webpacker (~> 5.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.0.rc.1
diff --git a/tasks/bug_report_template.rb b/tasks/bug_report_template.rb
@@ -16,7 +16,7 @@
   gem "sprockets", "3.7.2"
   gem "sassc-rails", "2.1.2"
   gem "sqlite3", "1.4.1", platform: :mri
-  gem "activerecord-jdbcsqlite3-adapter", "52.0", platform: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "60.0", platform: :jruby
   gem "jruby-openssl", "0.10.1", platform: :jruby
 end