Merge pull request #891 from Shopify/rafaelfranca-patch-1

paulomarg · web-flow · commit 217687de2080 · 2022-01-12T15:02:47.000-05:00
Remove Active Resource upper bound version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,16 +12,15 @@ jobs:
     strategy:
       matrix:
         version:
-          - "2.4"
-          - "2.5"
           - "2.6"
           - "2.7"
           - "3.0"
         gemfile:
           - Gemfile_ar41
           - Gemfile_ar50
           - Gemfile_ar51
-          - Gemfile_ar_master
+          - Gemfile_ar60
+          - Gemfile_ar_main
         exclude:
           - version: "2.7"
             gemfile: Gemfile_ar41
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     shopify_api (9.5)
-      activeresource (>= 4.1.0, < 6.0.0)
+      activeresource (>= 4.1.0)
       graphql-client
       rack
 
diff --git a/Gemfile_ar60 b/Gemfile_ar60
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem "activeresource", "~> 6.0"
diff --git a/Gemfile_ar_main b/Gemfile_ar_main
diff --git a/shopify_api.gemspec b/shopify_api.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.4"
 
-  s.add_runtime_dependency("activeresource", ">= 4.1.0", "< 6.0.0")
+  s.add_runtime_dependency("activeresource", ">= 4.1.0")
   s.add_runtime_dependency("rack")
   s.add_runtime_dependency("graphql-client")
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +source "https://rubygems.org"
++
 +gemspec
++
 +gem "activeresource", "~> 6.0"