From 8ef4485b1d0bf93a50967094d7bec476c8facbb3 Mon Sep 17 00:00:00 2001 From: Daniel Arnold Date: Tue, 21 Jul 2026 16:45:50 -0400 Subject: [PATCH] Update excon and require Ruby 3.1 - Upgrade the generated excon dependency to >=1.5.0, <2 - Update Ruby CI and release workflows from 2.7 to 3.1 - Set generated Marketing and Transactional gems to require Ruby 3.1 or greater --- .github/workflows/create-release-marketing.yml | 8 ++++---- .github/workflows/create-release-transactional.yml | 4 ++-- .github/workflows/test-marketing.yml | 2 +- .github/workflows/test-transactional.yml | 4 ++-- swagger-config/marketing/ruby/config.json | 1 + swagger-config/marketing/ruby/templates/gemspec.mustache | 2 +- swagger-config/transactional/ruby/config.json | 1 + .../transactional/ruby/templates/gemspec.mustache | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/create-release-marketing.yml b/.github/workflows/create-release-marketing.yml index 71d851d6..46910582 100644 --- a/.github/workflows/create-release-marketing.yml +++ b/.github/workflows/create-release-marketing.yml @@ -342,10 +342,10 @@ jobs: mkdir -p swagger-out/marketing-ruby unzip zip/mailchimp-marketing-ruby.zip -d swagger-out/marketing-ruby - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' - name: Install client dependencies run: gem install rspec @@ -528,10 +528,10 @@ jobs: path: .cache key: cache-dir - - name: Install Ruby 2.7 + - name: Install Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.1 - name: Prepare Build & Publishing Tools run: | diff --git a/.github/workflows/create-release-transactional.yml b/.github/workflows/create-release-transactional.yml index 3d2f2110..fd409aae 100644 --- a/.github/workflows/create-release-transactional.yml +++ b/.github/workflows/create-release-transactional.yml @@ -336,10 +336,10 @@ jobs: mkdir -p swagger-out/transactional-ruby unzip zip/mailchimp-transactional-ruby.zip -d swagger-out/transactional-ruby - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' - name: Install client dependencies run: gem install rspec diff --git a/.github/workflows/test-marketing.yml b/.github/workflows/test-marketing.yml index 9d78cfa0..f6596957 100644 --- a/.github/workflows/test-marketing.yml +++ b/.github/workflows/test-marketing.yml @@ -120,7 +120,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' - name: Install client dependencies run: gem install rspec diff --git a/.github/workflows/test-transactional.yml b/.github/workflows/test-transactional.yml index 6f66adce..7796db56 100644 --- a/.github/workflows/test-transactional.yml +++ b/.github/workflows/test-transactional.yml @@ -112,10 +112,10 @@ jobs: mkdir -p swagger-out/transactional-ruby unzip zip/mailchimp-transactional-ruby.zip -d swagger-out/transactional-ruby - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.1 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.1' - name: Install client dependencies run: gem install rspec diff --git a/swagger-config/marketing/ruby/config.json b/swagger-config/marketing/ruby/config.json index dcf0130a..88e25f8a 100644 --- a/swagger-config/marketing/ruby/config.json +++ b/swagger-config/marketing/ruby/config.json @@ -1,6 +1,7 @@ { "gemName": "MailchimpMarketing", "moduleName": "MailchimpMarketing", + "gemRequiredRubyVersion": ">= 3.1.0", "gemDescription": "The official Ruby client library for the Mailchimp Marketing API", "gemLicense": "Apache-2.0", "gitUserId": "mailchimp", diff --git a/swagger-config/marketing/ruby/templates/gemspec.mustache b/swagger-config/marketing/ruby/templates/gemspec.mustache index 28087580..0e0ca0f8 100644 --- a/swagger-config/marketing/ruby/templates/gemspec.mustache +++ b/swagger-config/marketing/ruby/templates/gemspec.mustache @@ -24,7 +24,7 @@ Gem::Specification.new do |s| {{/gemLicense}} s.required_ruby_version = "{{{gemRequiredRubyVersion}}}{{^gemRequiredRubyVersion}}>= 1.9{{/gemRequiredRubyVersion}}" - s.add_runtime_dependency 'excon', '>= 0.76.0', '<1' + s.add_runtime_dependency 'excon', '>= 1.5.0', '< 2' s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0' s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0' diff --git a/swagger-config/transactional/ruby/config.json b/swagger-config/transactional/ruby/config.json index 475e1977..6fe83838 100644 --- a/swagger-config/transactional/ruby/config.json +++ b/swagger-config/transactional/ruby/config.json @@ -1,6 +1,7 @@ { "gemName": "MailchimpTransactional", "moduleName": "MailchimpTransactional", + "gemRequiredRubyVersion": ">= 3.1.0", "gemDescription": "The official Ruby client library for the Mailchimp Trainsactional API", "gemLicense": "Apache-2.0", "gitUserId": "mailchimp", diff --git a/swagger-config/transactional/ruby/templates/gemspec.mustache b/swagger-config/transactional/ruby/templates/gemspec.mustache index 28087580..0e0ca0f8 100644 --- a/swagger-config/transactional/ruby/templates/gemspec.mustache +++ b/swagger-config/transactional/ruby/templates/gemspec.mustache @@ -24,7 +24,7 @@ Gem::Specification.new do |s| {{/gemLicense}} s.required_ruby_version = "{{{gemRequiredRubyVersion}}}{{^gemRequiredRubyVersion}}>= 1.9{{/gemRequiredRubyVersion}}" - s.add_runtime_dependency 'excon', '>= 0.76.0', '<1' + s.add_runtime_dependency 'excon', '>= 1.5.0', '< 2' s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0' s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'