diff --git a/.circleci/config.yml b/.circleci/config.yml index 78fbfa8e36f..0ed83abeef7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -494,6 +494,11 @@ job_configuration: ruby_version: 'jruby-9.3.9.0' image: ghcr.io/datadog/dd-trace-rb/jruby:9.3.9.0-dd resource_class_to_use: large + - &config-jruby-9_4 + <<: *filters_all_branches_and_tags + ruby_version: 'jruby-9.4.7.0' + image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd + resource_class_to_use: large workflows: version: 2 @@ -518,6 +523,7 @@ workflows: # ADD NEW RUBIES HERE - test-jruby-9.2 - test-jruby-9.3 + - test-jruby-9.4 - orb/changelog: <<: *config-2_7-small name: changelog @@ -638,6 +644,14 @@ workflows: name: test-jruby-9.3 requires: - build-jruby-9.3 + - orb/build: + <<: *config-jruby-9_4 + name: build-jruby-9.4 + - orb/test: + <<: *config-jruby-9_4 + name: test-jruby-9.4 + requires: + - build-jruby-9.4 # This workflow runs the same `build` and `test` jobs as above on a schedule. # Tasks related to housekeeping (e.g. prerelease) are not relevant # to this daily check, as they are not expected to be impacted here. @@ -769,3 +783,11 @@ workflows: name: test-jruby-9.3 requires: - build-jruby-9.3 + - orb/build: + <<: *config-jruby-9_4 + name: build-jruby-9.4 + - orb/test: + <<: *config-jruby-9_4 + name: test-jruby-9.4 + requires: + - build-jruby-9.4 diff --git a/Matrixfile b/Matrixfile index d207523de9d..fc08323fbbd 100644 --- a/Matrixfile +++ b/Matrixfile @@ -211,9 +211,10 @@ 'rails61-semantic-logger' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby' }, 'action_cable' => { - 'rails5-mysql2' => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby', - 'rails6-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby', - 'rails61-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby' + # FIXME: Enable the test for JRuby after fixing `log writing failed. closed stream` in CircleCI. + 'rails5-mysql2' => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ❌ jruby', + 'rails6-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ❌ jruby', + 'rails61-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby' }, 'action_mailer' => { 'rails5-mysql2' => '✅ 2.5 / ✅ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby', diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb index 531be1ee13b..a15df6ac3ac 100644 --- a/appraisal/jruby-9.4.rb +++ b/appraisal/jruby-9.4.rb @@ -1,8 +1,6 @@ -# TODO: Actually test JRuby 9.4 - appraise 'rails61-mysql2' do gem 'rails', '~> 6.1.0' - gem 'activerecord-jdbcmysql-adapter', platform: :jruby + gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby gem 'sprockets', '< 4' gem 'lograge', '~> 0.11' gem 'net-smtp' @@ -82,12 +80,12 @@ end appraise 'relational_db' do - gem 'activerecord', '~> 7' + gem 'activerecord', '~> 6.1.0' gem 'delayed_job' gem 'delayed_job_active_record' gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions - gem 'activerecord-jdbcmysql-adapter', platform: :jruby - gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby + gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby + gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0', platform: :jruby gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+ gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby end diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile b/gemfiles/jruby_9.4_rails61_mysql2.gemfile index 8c89f7e9a73..d1dc10483f7 100644 --- a/gemfiles/jruby_9.4_rails61_mysql2.gemfile +++ b/gemfiles/jruby_9.4_rails61_mysql2.gemfile @@ -34,7 +34,7 @@ gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "ffi", "~> 1.16.3", require: false gem "rails", "~> 6.1.0" -gem "activerecord-jdbcmysql-adapter", platform: :jruby +gem "activerecord-jdbcmysql-adapter", "~> 61.0", platform: :jruby gem "sprockets", "< 4" gem "lograge", "~> 0.11" gem "net-smtp" diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock index 271e4079b79..62cbebeda1f 100644 --- a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock @@ -20,139 +20,143 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + actioncable (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailbox (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (>= 2.7.1) - actionmailer (6.1.7.1) - actionpack (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailer (6.1.7.8) + actionpack (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.1) - actionview (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.1) - actionpack (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actiontext (6.1.7.8) + actionpack (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) nokogiri (>= 1.8.5) - actionview (6.1.7.1) - activesupport (= 6.1.7.1) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.1) - activesupport (= 6.1.7.1) + activejob (6.1.7.8) + activesupport (= 6.1.7.8) globalid (>= 0.3.6) - activemodel (6.1.7.1) - activesupport (= 6.1.7.1) - activerecord (6.1.7.1) - activemodel (= 6.1.7.1) - activesupport (= 6.1.7.1) - activerecord-jdbc-adapter (61.2-java) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activerecord-jdbc-adapter (61.3-java) activerecord (~> 6.1.0) - activerecord-jdbcmysql-adapter (61.2-java) - activerecord-jdbc-adapter (= 61.2) + activerecord-jdbcmysql-adapter (61.3-java) + activerecord-jdbc-adapter (= 61.3) jdbc-mysql (>= 5.1.36, < 9) - activestorage (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activesupport (= 6.1.7.1) + activestorage (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activesupport (= 6.1.7.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.1) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.4.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) appraisal (2.4.1) bundler rake thor (>= 0.14.0) ast (2.4.2) - benchmark-ips (2.10.0) + base64 (0.2.0) + benchmark-ips (2.13.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) - builder (3.2.4) + bigdecimal (3.1.8-java) + builder (3.3.0) climate_control (0.2.0) coderay (1.1.3) - concurrent-ruby (1.1.10) - crack (0.4.5) + concurrent-ruby (1.3.3) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - date (3.3.3-java) + date (3.3.4-java) debase-ruby_core_source (3.3.1) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) - dogstatsd-ruby (5.5.0) - erubi (1.12.0) + dogstatsd-ruby (5.6.1) + erubi (1.13.0) ffi (1.16.3-java) - globalid (1.0.1) - activesupport (>= 5.0) - hashdiff (1.0.1) - i18n (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + hashdiff (1.1.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jdbc-mysql (8.0.27) - json (2.6.3-java) + jdbc-mysql (8.0.30) + json (2.7.2-java) json-schema (2.8.1) addressable (>= 2.4) libdatadog (10.0.0.1.0) libddwaf (1.14.0.0.0-java) ffi (~> 1.0) - lograge (0.12.0) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) memory_profiler (0.9.14) - method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.17.0) + method_source (1.1.0) + mini_mime (1.1.5) + minitest (5.24.1) msgpack (1.7.2-java) - net-imap (0.3.4) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol - nio4r (2.5.8-java) - nokogiri (1.14.0-java) + nio4r (2.7.3-java) + nokogiri (1.16.6-java) racc (~> 1.4) os (1.1.4) - parallel (1.23.0) - parser (3.2.2.3) + parallel (1.25.1) + parser (3.3.3.0) ast (~> 2.4.1) racc pimpmychangelog (0.1.3) @@ -163,62 +167,65 @@ GEM pry-debugger-jruby (2.1.1-java) pry (>= 0.13, < 0.15) ruby-debug-base (>= 0.10.4, < 0.12) - racc (1.6.2-java) - rack (2.2.6.2) - rack-test (2.0.2) + public_suffix (6.0.0) + racc (1.8.0-java) + rack (2.2.9) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.1) - actioncable (= 6.1.7.1) - actionmailbox (= 6.1.7.1) - actionmailer (= 6.1.7.1) - actionpack (= 6.1.7.1) - actiontext (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activemodel (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + rails (6.1.7.8) + actioncable (= 6.1.7.8) + actionmailbox (= 6.1.7.8) + actionmailer (= 6.1.7.8) + actionpack (= 6.1.7.8) + actiontext (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activemodel (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) bundler (>= 1.15.0) - railties (= 6.1.7.1) + railties (= 6.1.7.8) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) - rake-compiler (1.2.1) + rake (13.2.1) + rake-compiler (1.2.7) rake - regexp_parser (2.8.1) - request_store (1.5.1) + regexp_parser (2.9.2) + request_store (1.7.0) rack (>= 1.4) - rexml (3.2.8) - strscan (>= 3.0.9) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-collection_matchers (1.2.0) + rexml (3.3.1) + strscan + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.2) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) - rspec-wait (0.0.9) - rspec (>= 3, < 4) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rspec-wait (0.0.10) + rspec (>= 3.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) @@ -231,15 +238,15 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) rubocop-packaging (0.5.2) rubocop (>= 1.33, < 2.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rspec (2.20.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) @@ -252,37 +259,37 @@ GEM simplecov_json_formatter (0.1.4) spoon (0.0.6) ffi - sprockets (3.7.2) + sprockets (3.7.3) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) strscan (3.1.0-java) - thor (1.2.1) - timeout (0.3.1) - tzinfo (2.0.5) + thor (1.3.1) + timeout (0.4.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) - warning (1.3.0) - webmock (3.13.0) - addressable (>= 2.3.6) + unicode-display_width (2.5.0) + warning (1.4.0) + webmock (3.23.1) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) - websocket-driver (0.7.5-java) + webrick (1.8.1) + websocket-driver (0.7.6-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - yard (0.9.28) - webrick (~> 1.7.0) - zeitwerk (2.6.6) + yard (0.9.36) + zeitwerk (2.6.16) PLATFORMS universal-java-11 DEPENDENCIES - activerecord-jdbcmysql-adapter + activerecord-jdbcmysql-adapter (~> 61.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) benchmark-memory (< 0.2) diff --git a/gemfiles/jruby_9.4_relational_db.gemfile b/gemfiles/jruby_9.4_relational_db.gemfile index 4ec7876ed4c..488c1b0b62e 100644 --- a/gemfiles/jruby_9.4_relational_db.gemfile +++ b/gemfiles/jruby_9.4_relational_db.gemfile @@ -33,12 +33,12 @@ gem "rubocop-performance", "~> 1.9", require: false gem "rubocop-rspec", ["~> 2.20", "< 2.21"], require: false gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "ffi", "~> 1.16.3", require: false -gem "activerecord", "~> 7" +gem "activerecord", "~> 6.1.0" gem "delayed_job" gem "delayed_job_active_record" gem "makara", ">= 0.6.0.pre" -gem "activerecord-jdbcmysql-adapter", platform: :jruby -gem "activerecord-jdbcpostgresql-adapter", platform: :jruby +gem "activerecord-jdbcmysql-adapter", "~> 61.0", platform: :jruby +gem "activerecord-jdbcpostgresql-adapter", "~> 61.0", platform: :jruby gem "sequel", "~> 5.54.0" gem "jdbc-sqlite3", ">= 3.28", platform: :jruby diff --git a/gemfiles/jruby_9.4_relational_db.gemfile.lock b/gemfiles/jruby_9.4_relational_db.gemfile.lock index 1ffb39d340a..8c08ab2b673 100644 --- a/gemfiles/jruby_9.4_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.4_relational_db.gemfile.lock @@ -20,56 +20,60 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activerecord-jdbc-adapter (70.1-java) - activerecord (~> 7.0) - activerecord-jdbcmysql-adapter (70.1-java) - activerecord-jdbc-adapter (= 70.1) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activerecord-jdbc-adapter (61.3-java) + activerecord (~> 6.1.0) + activerecord-jdbcmysql-adapter (61.3-java) + activerecord-jdbc-adapter (= 61.3) jdbc-mysql (>= 5.1.36, < 9) - activerecord-jdbcpostgresql-adapter (70.1-java) - activerecord-jdbc-adapter (= 70.1) + activerecord-jdbcpostgresql-adapter (61.3-java) + activerecord-jdbc-adapter (= 61.3) jdbc-postgres (>= 9.4, < 43) - activesupport (7.0.8) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.4.0) + zeitwerk (~> 2.3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) appraisal (2.4.1) bundler rake thor (>= 0.14.0) ast (2.4.2) - benchmark-ips (2.12.0) + benchmark-ips (2.13.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) - builder (3.2.4) + bigdecimal (3.1.8-java) + builder (3.3.0) climate_control (0.2.0) coderay (1.1.3) - concurrent-ruby (1.2.2) - crack (0.4.5) + concurrent-ruby (1.3.3) + crack (1.0.0) + bigdecimal rexml debase-ruby_core_source (3.3.1) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) + delayed_job_active_record (4.1.8) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) dogstatsd-ruby (5.6.1) ffi (1.16.3-java) - hashdiff (1.0.1) - i18n (1.14.1) + hashdiff (1.1.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) jdbc-mysql (8.0.30) jdbc-postgres (42.6.0) jdbc-sqlite3 (3.42.0.0) - json (2.6.3-java) + json (2.7.2-java) json-schema (2.8.1) addressable (>= 2.4) libdatadog (10.0.0.1.0) @@ -78,12 +82,12 @@ GEM makara (0.6.0.pre) activerecord (>= 5.2.0) memory_profiler (0.9.14) - method_source (1.0.0) - minitest (5.20.0) + method_source (1.1.0) + minitest (5.24.1) msgpack (1.7.2-java) os (1.1.4) - parallel (1.23.0) - parser (3.2.2.3) + parallel (1.25.1) + parser (3.3.3.0) ast (~> 2.4.1) racc pimpmychangelog (0.1.3) @@ -94,31 +98,32 @@ GEM pry-debugger-jruby (2.1.1-java) pry (>= 0.13, < 0.15) ruby-debug-base (>= 0.10.4, < 0.12) - racc (1.7.1-java) + public_suffix (6.0.0) + racc (1.8.0-java) rainbow (3.1.1) - rake (13.0.6) - rake-compiler (1.2.5) + rake (13.2.1) + rake-compiler (1.2.7) rake - regexp_parser (2.8.1) - rexml (3.2.8) - strscan (>= 3.0.9) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-collection_matchers (1.2.0) + regexp_parser (2.9.2) + rexml (3.3.1) + strscan + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-collection_matchers (1.2.1) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rspec-wait (0.0.9) - rspec (>= 3, < 4) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rspec-wait (0.0.10) + rspec (>= 3.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) @@ -131,15 +136,15 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) rubocop-packaging (0.5.2) rubocop (>= 1.33, < 2.0) - rubocop-performance (1.19.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rspec (2.20.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) @@ -154,25 +159,26 @@ GEM spoon (0.0.6) ffi strscan (3.1.0-java) - thor (1.2.2) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) - warning (1.3.0) - webmock (3.13.0) - addressable (>= 2.3.6) + unicode-display_width (2.5.0) + warning (1.4.0) + webmock (3.23.1) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - yard (0.9.34) + yard (0.9.36) + zeitwerk (2.6.16) PLATFORMS universal-java-11 DEPENDENCIES - activerecord (~> 7) - activerecord-jdbcmysql-adapter - activerecord-jdbcpostgresql-adapter + activerecord (~> 6.1.0) + activerecord-jdbcmysql-adapter (~> 61.0) + activerecord-jdbcpostgresql-adapter (~> 61.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8) benchmark-memory (< 0.2)