Merge pull request #1303 from Shopify/centralize_ruby_version

Centralize Ruby Version to `.ruby-version`

Author: paulomarg

.github/workflows/build.yml

@@ -13,6 +13,8 @@ jobs:
         version:
           - 3.0
           - 3.1
+          - 3.2
+          - 3.3
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.version }}

.rubocop.yml

@@ -5,7 +5,6 @@ require:
   - rubocop-sorbet
 
 AllCops:
-  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - "sorbet/**/*"

.ruby-version

@@ -0,0 +1 @@
+3.0.6

Gemfile

@@ -4,10 +4,22 @@ source "https://rubygems.org"
 
 gemspec
 
+group :test, :development do
+  gem "pry-byebug"
+end
+
+group :development do
+  gem "rake"
+  gem "rubocop"
+  gem "rubocop-shopify"
+  gem "rubocop-sorbet"
+  gem "sorbet"
+  gem "tapioca"
+end
+
 group :test do
   gem "minitest"
   gem "fakefs", require: false
   gem "webmock"
   gem "mocha"
-  gem "pry-byebug"
 end

Gemfile.lock

@@ -47,9 +47,10 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.7.1)
     jwt (2.8.1)
       base64
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.15.0)
@@ -79,25 +80,26 @@ GEM
     rbi (0.1.8)
       prism (>= 0.18.0, < 0.22)
       sorbet-runtime (>= 0.5.9204)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.62.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-shopify (2.10.1)
       rubocop (~> 1.35)
     rubocop-sorbet (0.6.11)
       rubocop (>= 0.90.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     securerandom (0.3.1)
     sorbet (0.5.11230)
       sorbet-static (= 0.5.11230)
@@ -126,7 +128,7 @@ GEM
     thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

dev.yml

@@ -3,7 +3,7 @@ name: shopify-api
 type: ruby
 
 up:
-  - ruby: 3.0.6
+  - ruby
   - bundler:
       gemfile: Gemfile
 

lib/shopify_api/auth/session.rb

@@ -130,8 +130,8 @@ def serialize
       sig { params(other: T.nilable(Session)).returns(T::Boolean) }
       def ==(other)
         if other
-          (
-            id == other.id &&
+
+          id == other.id &&
             shop == other.shop &&
             state == other.state &&
             scope == other.scope &&
@@ -140,7 +140,7 @@ def ==(other)
             online? == other.online? &&
             associated_user == other.associated_user &&
             shopify_session_id == other.shopify_session_id
-          )
+
         else
           false
         end

shopify_api.gemspec

@@ -42,12 +42,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("securerandom")
   s.add_runtime_dependency("sorbet-runtime")
   s.add_runtime_dependency("zeitwerk", "~> 2.5")
-
-  s.add_development_dependency("pry-byebug")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rubocop")
-  s.add_development_dependency("rubocop-shopify")
-  s.add_development_dependency("rubocop-sorbet")
-  s.add_development_dependency("sorbet")
-  s.add_development_dependency("tapioca")
 end

test/admin_versions_test.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative "./test_helper"
+require_relative "test_helper"
 
 module ShopifyAPITest
   class AdminVersionsTest < Minitest::Test

test/auth_test.rb

@@ -1,7 +1,7 @@
 # typed: false
 # frozen_string_literal: true
 
-require_relative "./test_helper"
+require_relative "test_helper"
 
 module ShopifyAPITest
   class AuthTest < Test::Unit::TestCase