From 3a2ff38470eed9ca096ba12444bf4e4bf4ed2707 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Wed, 25 Sep 2024 13:55:45 -0400 Subject: [PATCH] Use core minimum but allow 7.0/7.1/7.2 since core sets upper limit Drop end of life rubies and rails and add new versions Ensure we're testing and supporting community supported versions. Drop: * rails 6.0 * rails 6.1 Add: * ruby 3.2 * ruby 3.3 * rails 7.1 * rails 7.2 Note: ruby 3.0 is not difficult to keep maintaining for now but it's on the chopping block. --- .github/workflows/ci.yaml | 9 +++++++-- Gemfile | 10 +++++----- manageiq-api-client.gemspec | 4 +++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9b29502..ad63f9b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,10 +14,15 @@ jobs: ruby-version: - '3.0' - '3.1' + - '3.2' + - '3.3' rails-version: - - '6.0' - - '6.1' - '7.0' + - '7.1' + - '7.2' + exclude: + - ruby-version: '3.0' + rails-version: '7.2' env: TEST_RAILS_VERSION: ${{ matrix.rails-version }} CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} diff --git a/Gemfile b/Gemfile index 612676b..18d7692 100644 --- a/Gemfile +++ b/Gemfile @@ -9,12 +9,12 @@ eval_gemfile(dev_gemfile) if File.exist?(dev_gemfile) minimum_version = case ENV['TEST_RAILS_VERSION'] - when "6.0" - "~>6.0.4" - when "7.0" - "~>7.0.8" + when "7.2" + "~>7.2.1" + when "7.1" + "~>7.1.4" else - "~>6.1.4" + "~>7.0.8" end gem "activesupport", minimum_version diff --git a/manageiq-api-client.gemspec b/manageiq-api-client.gemspec index 85b86aa..63da6cf 100644 --- a/manageiq-api-client.gemspec +++ b/manageiq-api-client.gemspec @@ -23,7 +23,9 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency "activesupport", ">= 6.0", "<7.1" + spec.required_ruby_version = '>= 3.0' + + spec.add_dependency "activesupport", ">= 7.0", "<8.0" spec.add_dependency "faraday", ">= 1.0", "< 3.0" spec.add_dependency "faraday-follow_redirects" spec.add_dependency "json", "~> 2.3"