From 54ff7b0d659c1aa759894e70c0dbc76acf60ce01 Mon Sep 17 00:00:00 2001 From: Leos Stejskal Date: Fri, 5 Jun 2026 08:55:46 +0200 Subject: [PATCH] Support Ruby 3.0 & Ruby 3.3 --- .packit.yaml | 2 +- .rubocop.yml | 2 +- foreman_google.gemspec | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 5e2d2c0..a929b24 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -17,7 +17,7 @@ upstream_tag_template: v{version} actions: post-upstream-clone: - - "wget https://raw.githubusercontent.com/theforeman/foreman-packaging/rpm/develop/packages/plugins/rubygem-foreman_google/rubygem-foreman_google.spec -O rubygem-foreman_google.spec" + - "wget https://raw.githubusercontent.com/stejskalleos/foreman-packaging/refs/heads/ls/google-ruby33/packages/plugins/rubygem-foreman_google/rubygem-foreman_google.spec -O rubygem-foreman_google.spec" get-current-version: - ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("*.gemspec").first).version' create-archive: diff --git a/.rubocop.yml b/.rubocop.yml index 4cdd7b8..cea8e46 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,7 @@ inherit_gem: - strict.yml AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 Layout/LineLength: Enabled: 111 # TODO: discuss and set this diff --git a/foreman_google.gemspec b/foreman_google.gemspec index b5e24a2..bb3ea50 100644 --- a/foreman_google.gemspec +++ b/foreman_google.gemspec @@ -11,15 +11,11 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/theforeman/foreman_google' s.summary = 'Google Compute Engine plugin for the Foreman' s.description = 'Google Compute Engine plugin for the Foreman' - s.required_ruby_version = '>= 2.7', '< 4' + s.required_ruby_version = '>= 3.0', '< 4' s.files = Dir['{app,config,db,lib,locale,webpack}/**/*'] + ['LICENSE', 'Rakefile', 'README.md', 'package.json'] s.test_files = Dir['test/**/*'] + Dir['webpack/**/__tests__/*.js'] - # Pin Google versions to avoid breaking changes - # Never versions with google-protobuf > 3.25.4 - # are failing with `undefined method 'build'` error - s.add_dependency 'google-apis-compute_v1', '0.54.0' - s.add_dependency 'google-cloud-compute', '0.5.0' - s.add_dependency 'google-protobuf', '3.24.3' + s.add_dependency 'google-apis-compute_v1', '0.98.0' + s.add_dependency 'google-cloud-compute', '1.15.0' end