.circleci/config.yml in legion-cache-1.1.0 vs .circleci/config.yml in legion-cache-1.1.1

@@ -1,109 +1,100 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.2.1
-  sonarcloud: sonarsource/sonarcloud@1.0.1
+  ruby: circleci/ruby@1.1.2
+  sonarcloud: sonarsource/sonarcloud@1.0.2
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.7-node
+      - image: cimg/ruby:2.7
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - run: bundle exec rubocop --format=json --out=rubocop-result.json
+      - store_test_results:
+          path: rubocop-result.json
+      - sonarcloud/scan
+      - run: bundle exec rubocop
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
   "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.5
+      - image: cimg/ruby:2.5
       - image: redis:alpine
       - image: memcached:1.5-alpine
     steps:
       - checkout
-      - ruby/load-cache
-      - run:
-          name: update bundler
-          command: gem update bundler
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.6
+      - image: cimg/ruby:2.6
       - image: redis:alpine
       - image: memcached:1.5-alpine
     steps:
       - checkout
-      - ruby/load-cache
-      - run:
-          name: update bundler
-          command: gem update bundler
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-seven":
     docker:
       - image: circleci/ruby:2.7
-      - image: memcached:1.5-alpine
       - image: redis:alpine
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
-  "jruby-nine-two":
-    docker:
-      - image: circleci/jruby:9.2-jre
       - image: memcached:1.5-alpine
-      - image: redis:alpine
     steps:
       - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
       - store_test_results:
-          path: test-results
+          path: rspec-results.xml
       - sonarcloud/scan
-  "jruby-nine-two-e":
+  "ruby-three":
     docker:
-      - image: circleci/jruby:9.2.11-jre
-      - image: memcached:1.5-alpine
+      - image: circleci/ruby:3
       - image: redis:alpine
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "sonarcloud":
-    docker:
-      - image: circleci/ruby:2.7
       - image: memcached:1.5-alpine
-      - image: redis:alpine
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
       - sonarcloud/scan
-      - ruby/save-cache
 
 workflows:
   version: 2
   rubocop-rspec:
     jobs:
@@ -115,9 +106,8 @@
           requires:
             - ruby-two-five
       - ruby-two-seven:
           requires:
             - ruby-two-five
-      - sonarcloud:
+      - ruby-three:
           requires:
-            - ruby-two-seven
-            - ruby-two-six
+            - ruby-two-five
\ No newline at end of file