squash: Ruby 3.1 for Rails 7.2+

open-telemetry · Nov 15, 2024 · 611d2d8 · 611d2d8
1 parent d036caf
commit 611d2d8
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 24 deletions.
diff --git a/instrumentation/action_mailer/Appraisals b/instrumentation/action_mailer/Appraisals
@@ -4,12 +4,24 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "action_mailer-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
 appraise 'action_mailer-latest' do
-  gem 'action_mailer'
+  gem 'rails'
+end
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "action_mailer-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'action_mailer-latest' do
+    gem 'rails'
+  end
 end
diff --git a/instrumentation/action_pack/Appraisals b/instrumentation/action_pack/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "rails-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-appraise 'rails-latest' do
-  gem 'rails'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
+  end
 end
diff --git a/instrumentation/action_view/Appraisals b/instrumentation/action_view/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "action_view-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-appraise 'action_view-latest' do
-  gem 'action_view'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
+  end
 end
diff --git a/instrumentation/active_job/Appraisals b/instrumentation/active_job/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "activejob-#{version}" do
     gem 'activejob', "~> #{version}"
   end
 end
 
-appraise 'activejob-latest' do
-  gem 'activejob'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "activejob-#{version}" do
+      gem 'acivejob', "~> #{version}"
+    end
+  end
+
+  appraise 'activejob-latest' do
+    gem 'activejob'
+  end
 end
diff --git a/instrumentation/active_record/Appraisals b/instrumentation/active_record/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "activerecord-#{version}" do
     gem 'activerecord', "~> #{version}"
   end
 end
 
-appraise 'activerecord-latest' do
-  gem 'activerecord'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "activerecord-#{version}" do
+      gem 'activerecord', "~> #{version}"
+    end
+  end
+
+  appraise 'activerecord-latest' do
+    gem 'activerecord'
+  end
 end
diff --git a/instrumentation/active_support/Appraisals b/instrumentation/active_support/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "activesupport-#{version}" do
     gem 'activesupport', "~> #{version}"
   end
 end
 
-appraise 'activesupport-latest' do
-  gem 'activesupport'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "activesupport-#{version}" do
+      gem 'activesupport', "~> #{version}"
+    end
+  end
+
+  appraise 'activesupport-latest' do
+    gem 'activesupport'
+  end
 end
diff --git a/instrumentation/delayed_job/Appraisals b/instrumentation/delayed_job/Appraisals
@@ -4,14 +4,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "delayed_job_4.1-activejob-#{version}" do
     gem 'delayed_job', '~> 4.1'
     gem 'activejob', "~> #{version}"
   end
 end
 
-appraise 'delayed_job-activejob-latest' do
-  gem 'delayed_job'
-  gem 'activejob'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "delayed_job-4.1-activejob-#{version}" do
+      gem 'delayed_job', '~> 4.1'
+      gem 'activejob', "~> #{version}"
+    end
+  end
+
+  appraise 'delayed_job-latest' do
+    gem 'delayed_job'
+    gem 'activejob'
+  end
 end
diff --git a/instrumentation/rails/Appraisals b/instrumentation/rails/Appraisals
@@ -4,12 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[6.1.0 7.0.0 7.1.0 7.2.0].each do |version|
+%w[6.1.0 7.0.0 7.1.0].each do |version|
   appraise "rails-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-appraise 'rails-latest' do
-  gem 'rails'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
+  end
 end