Update to 52

redbooth · Apr 9, 2024 · e967a6b · e967a6b
1 parent b10e50f
commit e967a6b
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 380 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 references:
 
   ruby_image: &ruby_image
-    circleci/ruby:2.3.3
+    circleci/ruby:2.7.7
 
   mysql_container_config: &mysql_container_config
     docker:
@@ -18,13 +18,6 @@ references:
     docker:
       - image: *ruby_image
 
-  install_bundler: &install_bundler
-    run:
-      name: Install Bundler
-      command: |
-        gem install bundler -v 1.14.6
-        gem cleanup bundler
-
   install_gems: &install_gems
     run:
       name: Install Gems
@@ -48,15 +41,13 @@ jobs:
       - DB_PORT=3306
     steps:
       - checkout
-      - *install_bundler
       - *install_gems
       - *appraisal_install
       - *appraisal_rspec
   test_on_sqlite:
     <<: *sqlite_container_config
     steps:
       - checkout
-      - *install_bundler
       - *install_gems
       - *appraisal_install
       - *appraisal_rspec

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.7.7
diff --git a/Appraisals b/Appraisals
@@ -1,24 +1,14 @@
-appraise 'activerecord-41' do
-  gem 'activerecord', '~> 4.1.0'
-  gem 'mysql2', '0.3.20' if ENV['CONFIG_MYSQL']
-end
-
-appraise 'activerecord-42' do
-  gem 'activerecord', '~> 4.2.0'
-  gem 'mysql2', '~> 0.4.0' if ENV['CONFIG_MYSQL']
-end
-
 appraise 'activerecord-50' do
   gem 'activerecord', '~> 5.0.0'
-  gem 'mysql2', '~> 0.5.0' if ENV['CONFIG_MYSQL']
+  gem 'mysql2' if ENV['CONFIG_MYSQL']
 end
 
 appraise 'activerecord-51' do
   gem 'activerecord', '~> 5.1.0'
-  gem 'mysql2', '~> 0.5.0' if ENV['CONFIG_MYSQL']
+  gem 'mysql2' if ENV['CONFIG_MYSQL']
 end
 
 appraise 'activerecord-52' do
   gem 'activerecord', '~> 5.2.0'
-  gem 'mysql2', '~> 0.5.0' if ENV['CONFIG_MYSQL']
+  gem 'mysql2' if ENV['CONFIG_MYSQL']
 end
diff --git a/gemfiles/activerecord_41.gemfile b/gemfiles/activerecord_41.gemfile
diff --git a/gemfiles/activerecord_41.gemfile.lock b/gemfiles/activerecord_41.gemfile.lock
diff --git a/gemfiles/activerecord_42.gemfile b/gemfiles/activerecord_42.gemfile
diff --git a/gemfiles/activerecord_42.gemfile.lock b/gemfiles/activerecord_42.gemfile.lock
diff --git a/gemfiles/activerecord_50.gemfile b/gemfiles/activerecord_50.gemfile
@@ -3,6 +3,6 @@
 source "http://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
-gem "mysql2", "~> 0.5.0"
+gem "mysql2"
 
 gemspec path: "../"