Update Rails gemspec dependencies and CI matrix gemfiles

toptal · Jan 27, 2021 · 497dcb0 · 497dcb0
1 parent 94746fa
commit 497dcb0
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 124 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,15 +14,18 @@ workflows:
   build:
     jobs:
       - rubocop
-      - rspec-ruby-25-activerecord60
-      - rspec-ruby-25-activerecord52
-      - rspec-ruby-25-mongoid
+      - rspec-ruby-26-activerecord61
       - rspec-ruby-26-activerecord60
       - rspec-ruby-26-activerecord52
       - rspec-ruby-26-mongoid
+      - rspec-ruby-27-activerecord61
       - rspec-ruby-27-activerecord60
       - rspec-ruby-27-activerecord52
       - rspec-ruby-27-mongoid
+      - rspec-ruby-30-activerecord61
+      - rspec-ruby-30-activerecord60
+      - rspec-ruby-30-activerecord52
+      - rspec-ruby-30-mongoid
         # TODO elastic 7
         # TODO sequel?
 
@@ -105,9 +108,9 @@ jobs:
           command: |
             bundle exec rubocop --format simple
 
-  rspec-ruby-25-activerecord52:
+  rspec-ruby-26-activerecord52:
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -117,9 +120,9 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-25-activerecord60:
+  rspec-ruby-26-activerecord60:
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -129,22 +132,34 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-25-mongoid:
+  rspec-ruby-26-activerecord61:
     docker:
-      - image: circleci/ruby:2.5
-      - image: circleci/mongo:4.2.5
+      - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
     working_directory: ~/repo
     environment:
-      GEMFILE: gemfiles/rails.5.1.mongoid.6.3.gemfile
+      GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
     steps:
       - rspec-test
 
-  rspec-ruby-26-activerecord52:
+  rspec-ruby-26-mongoid:
     docker:
       - image: circleci/ruby:2.6
+      - image: circleci/mongo:4.2.5
+      - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
+        environment:
+          <<: *es56-env
+    working_directory: ~/repo
+    environment:
+      GEMFILE: gemfiles/rails.5.2.mongoid.6.4.gemfile
+    steps:
+      - rspec-test
+
+  rspec-ruby-27-activerecord52:
+    docker:
+      - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -154,9 +169,9 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-26-activerecord60:
+  rspec-ruby-27-activerecord60:
     docker:
-      - image: circleci/ruby:2.6
+      - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -166,22 +181,34 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-26-mongoid:
+  rspec-ruby-27-activerecord61:
     docker:
-      - image: circleci/ruby:2.6
-      - image: circleci/mongo:4.2.5
+      - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
     working_directory: ~/repo
     environment:
-      GEMFILE: gemfiles/rails.5.1.mongoid.6.3.gemfile
+      GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
     steps:
       - rspec-test
 
-  rspec-ruby-27-activerecord52:
+  rspec-ruby-27-mongoid:
     docker:
       - image: circleci/ruby:2.7
+      - image: circleci/mongo:4.2.5
+      - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
+        environment:
+          <<: *es56-env
+    working_directory: ~/repo
+    environment:
+      GEMFILE: gemfiles/rails.5.2.mongoid.6.4.gemfile
+    steps:
+      - rspec-test
+
+  rspec-ruby-30-activerecord52:
+    docker:
+      - image: circleci/ruby:3.0
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -191,9 +218,9 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-27-activerecord60:
+  rspec-ruby-30-activerecord60:
     docker:
-      - image: circleci/ruby:2.7
+      - image: circleci/ruby:3.0
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
           <<: *es56-env
@@ -203,9 +230,21 @@ jobs:
     steps:
       - rspec-test
 
-  rspec-ruby-27-mongoid:
+  rspec-ruby-30-activerecord61:
     docker:
-      - image: circleci/ruby:2.7
+      - image: circleci/ruby:3.0
+      - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
+        environment:
+          <<: *es56-env
+    working_directory: ~/repo
+    environment:
+      GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
+    steps:
+      - rspec-test
+
+  rspec-ruby-30-mongoid:
+    docker:
+      - image: circleci/ruby:3.0
       - image: circleci/mongo:4.2.5
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # master
 
+  * Update gemspec dependencies for Rails. Update CI gemfiles and matrix to tests against current LTS Rails versions.
+
 # Version 5.1.0
 
 ## Breaking changes

diff --git a/chewy.gemspec b/chewy.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.add_development_dependency 'method_source'
   spec.add_development_dependency 'unparser'
 
-  spec.add_dependency 'activesupport', '>= 4.0'
+  spec.add_dependency 'activesupport', '>= 5.2'
   spec.add_dependency 'elasticsearch', '>= 2.0.0'
   spec.add_dependency 'elasticsearch-dsl'
 end
diff --git a/gemfiles/rails.4.0.activerecord.gemfile b/gemfiles/rails.4.0.activerecord.gemfile
diff --git a/gemfiles/rails.4.1.activerecord.gemfile b/gemfiles/rails.4.1.activerecord.gemfile
diff --git a/gemfiles/rails.4.2.activerecord.gemfile b/gemfiles/rails.4.2.activerecord.gemfile
diff --git a/gemfiles/rails.4.2.mongoid.5.2.gemfile b/gemfiles/rails.4.2.mongoid.5.2.gemfile
diff --git a/gemfiles/rails.5.0.mongoid.6.1.gemfile b/gemfiles/rails.5.0.mongoid.6.1.gemfile
diff --git a/gemfiles/rails.5.1.activerecord.gemfile b/gemfiles/rails.5.1.activerecord.gemfile
diff --git a/gemfiles/rails.5.1.mongoid.6.3.gemfile → gemfiles/rails.5.2.mongoid.6.4.gemfile b/gemfiles/rails.5.1.mongoid.6.3.gemfile → gemfiles/rails.5.2.mongoid.6.4.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 6.3.0"
-gem "activesupport", "~> 5.1.0"
-gem "activejob", "~> 5.1.0"
+gem "mongoid", "~> 6.4.0"
+gem "activesupport", "~> 5.2.0"
+gem "activejob", "~> 5.2.0"
 gem "resque", require: false
 gem "shoryuken", require: false
 gem "aws-sdk-sqs", require: false

diff --git a/gemfiles/rails.5.0.activerecord.gemfile → gemfiles/rails.6.1.activerecord.gemfile b/gemfiles/rails.5.0.activerecord.gemfile → gemfiles/rails.6.1.activerecord.gemfile
@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
-gem "activesupport", "~> 5.0.0"
-gem "activejob", "~> 5.0.0"
+gem "activerecord", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "activejob", "~> 6.1.0"
 gem "resque", require: false
 gem "shoryuken", require: false
 gem "aws-sdk-sqs", require: false