Merge pull request #4152 from DataDog/tonycthsu/update-deps

Update gemspec dependencies
DataDog · Nov 25, 2024 · 7f72e43 · 7f72e43
2 parents 0d88e2a + 4dec6f0
commit 7f72e43
Show file tree

Hide file tree

Showing 99 changed files with 134 additions and 242 deletions.
diff --git a/.github/workflows/update-latest-dependency.yml b/.github/workflows/update-latest-dependency.yml
@@ -54,7 +54,7 @@ jobs:
         run: bundle install
 
       - name: Update latest
-        run: bundle exec rake edge:update
+        run: bundle exec rake edge:gemspec edge:update
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

diff --git a/Rakefile b/Rakefile
@@ -27,8 +27,6 @@ namespace :test do
   desc 'Run all tests'
   task all: TEST_METADATA.map { |k, _| "test:#{k}" }
 
-  ruby_version = RUBY_VERSION[0..2]
-
   major, minor, = if defined?(RUBY_ENGINE_VERSION)
                     Gem::Version.new(RUBY_ENGINE_VERSION).segments
                   else
@@ -46,14 +44,11 @@ namespace :test do
       spec_arguments = args.task_args
 
       candidates = spec_metadata.select do |appraisal_group, rubies|
-        if RUBY_PLATFORM == 'java'
-          # Rails 4.x is not supported on JRuby 9.2 (which is RUBY_VERSION 2.5)
-          next false if ruby_runtime == 'jruby-9.2' && appraisal_group.start_with?('rails4')
+        # Exceptions:
+        # Rails 4.x is not supported on JRuby 9.2 (which is RUBY_VERSION 2.5)
+        next false if ruby_runtime == 'jruby-9.2' && appraisal_group.start_with?('rails4')
 
-          rubies.include?("✅ #{ruby_version}") && rubies.include?('✅ jruby')
-        else
-          rubies.include?("✅ #{ruby_version}")
-        end
+        RuntimeMatcher.match?(rubies)
       end
 
       candidates.each do |appraisal_group, _|

diff --git a/gemfiles/ruby_3.4_activesupport.gemfile b/gemfiles/ruby_3.4_activesupport.gemfile
diff --git a/gemfiles/ruby_3.4_activesupport.gemfile.lock b/gemfiles/ruby_3.4_activesupport.gemfile.lock
diff --git a/gemfiles/ruby_3.4_aws.gemfile b/gemfiles/ruby_3.4_aws.gemfile
diff --git a/gemfiles/ruby_3.4_aws.gemfile.lock b/gemfiles/ruby_3.4_aws.gemfile.lock
diff --git a/gemfiles/ruby_3.4_contrib.gemfile b/gemfiles/ruby_3.4_contrib.gemfile
diff --git a/gemfiles/ruby_3.4_contrib.gemfile.lock b/gemfiles/ruby_3.4_contrib.gemfile.lock
diff --git a/gemfiles/ruby_3.4_contrib_old.gemfile b/gemfiles/ruby_3.4_contrib_old.gemfile
diff --git a/gemfiles/ruby_3.4_contrib_old.gemfile.lock b/gemfiles/ruby_3.4_contrib_old.gemfile.lock
diff --git a/gemfiles/ruby_3.4_core_old.gemfile b/gemfiles/ruby_3.4_core_old.gemfile
diff --git a/gemfiles/ruby_3.4_core_old.gemfile.lock b/gemfiles/ruby_3.4_core_old.gemfile.lock
diff --git a/gemfiles/ruby_3.4_elasticsearch_7.gemfile b/gemfiles/ruby_3.4_elasticsearch_7.gemfile
diff --git a/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/ruby_3.4_elasticsearch_8.gemfile b/gemfiles/ruby_3.4_elasticsearch_8.gemfile
diff --git a/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile
diff --git a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
diff --git a/gemfiles/ruby_3.4_graphql_1.13.gemfile b/gemfiles/ruby_3.4_graphql_1.13.gemfile
diff --git a/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
diff --git a/gemfiles/ruby_3.4_graphql_2.0.gemfile b/gemfiles/ruby_3.4_graphql_2.0.gemfile
diff --git a/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
diff --git a/gemfiles/ruby_3.4_graphql_2.1.gemfile b/gemfiles/ruby_3.4_graphql_2.1.gemfile