Update ci to use newest ruby versions

Goltergaul · Feb 25, 2022 · 2d5e18e · 2d5e18e
1 parent 21fca2d
commit 2d5e18e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 53 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2.1
 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
 # See: https://circleci.com/docs/2.0/orb-intro/
 orbs:
-  ruby: circleci/ruby@1.2.0
+  ruby: circleci/ruby@1.4.0
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
@@ -18,7 +18,10 @@ jobs:
       - image: << parameters.image>>
     steps:
       - checkout
-      - ruby/install-deps
+      - run: rm Gemfile.lock
+      - run: export GEM=$(which gem); sudo $GEM update --system --no-document
+      - run: gem install bundler
+      - run: bundle install
       - ruby/rspec-test
   linting:
     docker:
@@ -39,5 +42,11 @@ workflows:
       - test: 
           matrix:
             parameters:
-              image: ["cimg/ruby:2.5", "cimg/ruby:2.6", "cimg/ruby:2.7", "cimg/ruby:3.0", "circleci/jruby:9.3.1-jdk11", "circleci/jruby:9.2.20-jdk11"]
+              image:
+                - "cimg/ruby:2.6"
+                - "cimg/ruby:2.7"
+                - "cimg/ruby:3.0"
+                - "cimg/ruby:3.1"
+                - "circleci/jruby:9.3.3-jdk11"
+                - "circleci/jruby:9.2.20-jdk11"
       - linting
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,24 +8,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     approvals (0.0.25)
       nokogiri (~> 1.8)
       thor (~> 1.0)
     ast (2.4.2)
     awesome_print (1.9.2)
-    benchmark-ips (2.9.2)
+    benchmark-ips (2.10.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    ffi (1.15.4)
-    ffi (1.15.4-java)
-    formatador (0.3.0)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -43,66 +41,52 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jar-dependencies (0.4.1)
     jaro_winkler (1.5.4)
-    jaro_winkler (1.5.4-java)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     nenv (0.3.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    nokogiri (1.12.5-java)
-      racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.21.0)
-    parser (3.0.3.2)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry (0.14.1-java)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-      spoon (~> 0.0)
-    psych (4.0.2)
-    psych (4.0.2-java)
-      jar-dependencies (>= 0.1.7)
+    psych (4.0.3)
+      stringio
     racc (1.6.0)
-    racc (1.6.0-java)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
@@ -117,18 +101,14 @@ GEM
     rubocop_runner (2.2.0)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    spoon (0.0.6)
-      ffi
-    thor (1.1.0)
+    stringio (3.0.1)
+    thor (1.2.1)
     timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.5.0)
-    zeitwerk (2.5.1)
 
 PLATFORMS
-  ruby
-  universal-java-11
   x86_64-linux
 
 DEPENDENCIES
@@ -150,4 +130,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.2.33
+   2.3.7
diff --git a/lib/definition/conform_result.rb b/lib/definition/conform_result.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/hash"
+require "active_support"
 
 module Definition
   class ConformResult