Merge pull request #268 from DataDog/anmarchenko/deps_update_ci_update

[SDTEST-1322] update dependencies and remove unnecessary dependencies from test gemfiles

.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,7 +40,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

Appraisals

@@ -13,10 +13,13 @@ end
 
 alias original_appraise appraise
 
-REMOVED_GEMS = {
-  check: %w[rbs steep ruby_memcheck],
-  development: %w[ruby-lsp ruby-lsp-rspec debug irb]
-}
+require "bundler"
+
+definition = Bundler.definition
+GEMS_TO_REMOVE = Hash.new { |hash, key| hash[key] = definition.dependencies_for([key]).map(&:name) }
+
+[:development, :check].each { |g| GEMS_TO_REMOVE[g] }
+
 RUBY_VERSION = Gem::Version.new(RUBY_ENGINE_VERSION)
 
 def appraise(group, &block)
@@ -25,7 +28,7 @@ def appraise(group, &block)
     original_appraise(group) do
       instance_exec(&block)
 
-      REMOVED_GEMS.each do |group_name, gems|
+      GEMS_TO_REMOVE.each do |group_name, gems|
         group(group_name) do
           gems.each do |gem_name|
             remove_gem gem_name

Gemfile

@@ -5,51 +5,56 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in datadog-ci.gemspec
 gemspec
 
-# dev experience
-gem "pry"
-gem "rake"
-gem "standard", "~> 1.31"
+# debugging
+gem "debug" if RUBY_PLATFORM != "java"
 
 # native extensions
 gem "rake-compiler"
 
-# testing
+# coverage
+gem "simplecov"
+
+# build&test
 gem "rspec"
 gem "rspec-collection_matchers"
 gem "rspec_junit_formatter"
-gem "climate_control"
 gem "appraisal"
+gem "climate_control"
 gem "webmock"
-# platform helpers
-gem "os"
-
-# docs and release
+gem "rake"
 gem "yard"
-gem "redcarpet" if RUBY_PLATFORM != "java"
-gem "webrick"
-gem "pimpmychangelog", ">= 0.1.2"
 
-# coverage
-gem "simplecov"
+# platform helpers
+gem "os"
 
 # type checks, memory checks, etc.
 group :check do
+  # style
+  gem "standard", "~> 1.31"
+
+  # type checks
   if RUBY_VERSION >= "3.0.0" && RUBY_PLATFORM != "java"
     gem "rbs", "~> 3.5.0", require: false
     gem "steep", "~> 1.7.0", require: false
   end
 
+  # memory checks
   gem "ruby_memcheck", ">= 3" if RUBY_VERSION >= "3.4.0" && RUBY_PLATFORM != "java"
 end
 
 # development dependencies for vscode integration and debugging
 group :development do
   if RUBY_VERSION >= "3.0.0" && RUBY_PLATFORM != "java"
+    # vscode integration
     gem "ruby-lsp"
     gem "ruby-lsp-rspec"
+  end
 
-    gem "debug"
+  # docs and release
+  gem "redcarpet" if RUBY_PLATFORM != "java"
+  gem "webrick"
+  gem "pimpmychangelog", ">= 0.1.2"
 
-    gem "irb"
-  end
+  # irb is updated earlier that way
+  gem "irb" if RUBY_PLATFORM != "java"
 end

gemfiles/jruby_9.4_activesupport_4.gemfile

@@ -2,22 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "pry"
-gem "rake"
-gem "standard", "~> 1.31"
 gem "rake-compiler"
+gem "simplecov"
 gem "rspec"
 gem "rspec-collection_matchers"
 gem "rspec_junit_formatter"
-gem "climate_control"
 gem "appraisal"
+gem "climate_control"
 gem "webmock"
-gem "os"
+gem "rake"
 gem "yard"
-gem "webrick"
-gem "pimpmychangelog", ">= 0.1.2"
-gem "simplecov"
-gem "simplecov-cobertura", "~> 2.1.0"
+gem "os"
 gem "activesupport", "~> 4"
 gem "bigdecimal", "< 3.1.8"
 

gemfiles/jruby_9.4_activesupport_4.gemfile.lock

@@ -19,119 +19,66 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.2)
     bigdecimal (3.1.7-java)
     climate_control (1.2.0)
-    coderay (1.1.3)
     concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
       rexml
-    datadog (2.4.0)
-      debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 12.0.0.1.0)
-      libddwaf (~> 1.14.0.0.0)
+    datadog (2.8.0)
+      datadog-ruby_core_source (~> 3.3)
+      libdatadog (~> 14.3.1.1.0)
+      libddwaf (~> 1.18.0.0.0)
       msgpack
-    debase-ruby_core_source (3.3.1)
+    datadog-ruby_core_source (3.3.6)
     diff-lcs (1.5.1)
     docile (1.4.1)
     ffi (1.17.0-java)
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.7.2-java)
-    language_server-protocol (3.17.0.3)
-    libdatadog (12.0.0.1.0)
-    libddwaf (1.14.0.0.0-java)
+    libdatadog (14.3.1.1.0)
+    libddwaf (1.18.0.0.0-java)
       ffi (~> 1.0)
-    lint_roller (1.1.0)
-    method_source (1.1.0)
-    minitest (5.25.1)
-    msgpack (1.7.3-java)
+    minitest (5.25.4)
+    msgpack (1.7.5-java)
     os (1.1.4)
-    parallel (1.26.3)
-    parser (3.3.5.0)
-      ast (~> 2.4.1)
-      racc
-    pimpmychangelog (0.1.3)
-    pry (0.14.2-java)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-      spoon (~> 0.0)
     public_suffix (6.0.1)
-    racc (1.8.1-java)
-    rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.8)
       rake
-    regexp_parser (2.9.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     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.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.66.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.22.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
-      rexml
-      simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    spoon (0.0.6)
-      ffi
-    standard (1.41.0)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.66.0)
-      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.5)
-    standard-custom (1.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.50)
-    standard-performance (1.5.0)
-      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.22.0)
     thor (1.3.2)
     thread_safe (0.3.6-java)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    unicode-display_width (2.6.0)
     webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.2)
     yard (0.9.37)
 
 PLATFORMS
@@ -144,18 +91,13 @@ DEPENDENCIES
   climate_control
   datadog-ci!
   os
-  pimpmychangelog (>= 0.1.2)
-  pry
   rake
   rake-compiler
   rspec
   rspec-collection_matchers
   rspec_junit_formatter
   simplecov
-  simplecov-cobertura (~> 2.1.0)
-  standard (~> 1.31)
   webmock
-  webrick
   yard
 
 BUNDLED WITH

gemfiles/jruby_9.4_activesupport_5.gemfile

@@ -2,22 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "pry"
-gem "rake"
-gem "standard", "~> 1.31"
 gem "rake-compiler"
+gem "simplecov"
 gem "rspec"
 gem "rspec-collection_matchers"
 gem "rspec_junit_formatter"
-gem "climate_control"
 gem "appraisal"
+gem "climate_control"
 gem "webmock"
-gem "os"
+gem "rake"
 gem "yard"
-gem "webrick"
-gem "pimpmychangelog", ">= 0.1.2"
-gem "simplecov"
-gem "simplecov-cobertura", "~> 2.1.0"
+gem "os"
 gem "activesupport", "~> 5"
 gem "bigdecimal", "< 3.1.8"