From 004da582f314d3331aa31e826db3ad811d1c69b3 Mon Sep 17 00:00:00 2001 From: scudco <3806+scudco@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:38:02 -0500 Subject: [PATCH 1/2] Add support for Ruby 3.4 --- .github/workflows/test.yml | 2 +- .ruby-version | 2 +- Gemfile | 7 +++++++ ruby_audit.gemspec | 7 ++----- vendor/ruby-advisory-db | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be96a9a..d5c8a74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: test: strategy: matrix: - ruby_version: [3.1, 3.2, 3.3] + ruby_version: [3.1, 3.2, 3.3, 3.4] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.ruby-version b/.ruby-version index bea438e..47b322c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.1 +3.4.1 diff --git a/Gemfile b/Gemfile index 79e23ab..12b38ee 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,10 @@ source 'https://rubygems.org' # Specify your gem's dependencies in ruby_audit.gemspec gemspec + +gem 'base64', '~> 0.2.0' +gem 'ostruct', '~> 0.6.1' +gem 'pry', '~> 0.14.1' +gem 'rake', '~> 13.0' +gem 'rspec', '~> 3.9' +gem 'rubocop', '~> 1.69.2' diff --git a/ruby_audit.gemspec b/ruby_audit.gemspec index 4404a1c..b06b03c 100644 --- a/ruby_audit.gemspec +++ b/ruby_audit.gemspec @@ -18,15 +18,12 @@ Gem::Specification.new do |spec| spec.homepage = 'https://github.com/civisanalytics/ruby_audit' spec.license = 'GPL-3.0-or-later' - spec.required_ruby_version = ['>= 3.1', '< 3.4'] + spec.required_ruby_version = ['>= 3.1', '< 3.5'] spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } spec.bindir = 'exe' spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] spec.add_dependency 'bundler-audit', '~> 0.9.0' - spec.add_development_dependency 'pry', '~> 0.14.1' - spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rspec', '~> 3.9' - spec.add_development_dependency 'rubocop', '~> 1.64.0' + spec.metadata['rubygems_mfa_required'] = 'true' end diff --git a/vendor/ruby-advisory-db b/vendor/ruby-advisory-db index 7ef0ac6..161d6cf 160000 --- a/vendor/ruby-advisory-db +++ b/vendor/ruby-advisory-db @@ -1 +1 @@ -Subproject commit 7ef0ac6eeaedc63eb3a43ac7039ab195b958feaa +Subproject commit 161d6cf3899524565a22d8b83d861856ccb0af15 From ef0c40fd6808d9b9275a2b4777505e2e8bb388bc Mon Sep 17 00:00:00 2001 From: scudco <3806+scudco@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:35:58 -0500 Subject: [PATCH 2/2] remove duplicate metadata setting in gemspec --- ruby_audit.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/ruby_audit.gemspec b/ruby_audit.gemspec index b06b03c..d3ebc73 100644 --- a/ruby_audit.gemspec +++ b/ruby_audit.gemspec @@ -25,5 +25,4 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_dependency 'bundler-audit', '~> 0.9.0' - spec.metadata['rubygems_mfa_required'] = 'true' end