Merge pull request #30 from pepabo/fix-error-on-activesupport-7

Fix error on activesupport 7
pepabo · May 21, 2024 · b19eae1 · b19eae1
2 parents 1664bf4 + 3b75fca
commit b19eae1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,16 +7,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0]
+        ruby: [2.7, 3.0, 3.1, 3.2]
+        gemfile: ["active_support_6", "active_support_7"]
 
     runs-on: ubuntu-latest
 
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
     steps:
     - uses: actions/checkout@v2
 
-    - uses: ruby/setup-ruby@v1.64.1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
+        cache-version: ${{ matrix.gemfile }}
 
     - run: bundle exec rspec
diff --git a/gemfiles/active_support_6.gemfile b/gemfiles/active_support_6.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', "~> 6.0"
+
+# Specify your gem's dependencies in global_sign.gemspec
+gemspec path: '../'
diff --git a/gemfiles/active_support_7.gemfile b/gemfiles/active_support_7.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', "~> 7.0"
+
+# Specify your gem's dependencies in global_sign.gemspec
+gemspec path: '../'
diff --git a/lib/global_sign.rb b/lib/global_sign.rb
@@ -1,4 +1,5 @@
-require 'active_support/core_ext/hash/conversions'
+require 'active_support'
+require 'active_support/core_ext'
 
 require 'global_sign/version'
 require 'global_sign/client'