From d07126860b938eab92c156df1578bf7635c1baee Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 10:13:20 -0500 Subject: [PATCH 1/9] bump dependency to latest major version of the API --- Gemfile.lock | 4 ++-- shopify_app.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index adc09cce4..65f52eff8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH jwt (>= 2.2.3) rails (> 5.2.1) redirect_safely (~> 1.0) - shopify_api (~> 13.4) + shopify_api (~> 14.0) sprockets-rails (>= 2.0.0) GEM @@ -217,7 +217,7 @@ GEM ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) securerandom (0.2.2) - shopify_api (13.4.0) + shopify_api (14.0.0) activesupport concurrent-ruby hash_diff diff --git a/shopify_app.gemspec b/shopify_app.gemspec index cfa189165..c6ebb9886 100644 --- a/shopify_app.gemspec +++ b/shopify_app.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("jwt", ">= 2.2.3") s.add_runtime_dependency("rails", "> 5.2.1") s.add_runtime_dependency("redirect_safely", "~> 1.0") - s.add_runtime_dependency("shopify_api", "~> 13.4") + s.add_runtime_dependency("shopify_api", "~> 14.0") s.add_runtime_dependency("sprockets-rails", ">= 2.0.0") s.add_development_dependency("byebug") From 57b0d16796f0393b3c7fd2ac73f7122445d9f89a Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 10:27:01 -0500 Subject: [PATCH 2/9] drop ruby 2.7 from CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49d289323..e24f719e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: name: Ruby ${{ matrix.version }} strategy: matrix: - version: ['2.7', '3.0', '3.1', '3.2'] + version: ['3.0', '3.1', '3.2'] steps: - uses: actions/checkout@v3 From cb8999e5ef830e31b9fedbc1447de15b8f479fbe Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 10:28:53 -0500 Subject: [PATCH 3/9] increase mimimum ruby to 3.0 --- shopify_app.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shopify_app.gemspec b/shopify_app.gemspec index c6ebb9886..8eea76c54 100644 --- a/shopify_app.gemspec +++ b/shopify_app.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.author = "Shopify" s.summary = "This gem is used to get quickly started with the Shopify API" - s.required_ruby_version = ">= 2.7" + s.required_ruby_version = ">= 3.0" s.metadata["allowed_push_host"] = "https://rubygems.org" From 2dbf3f3792de51ae4c7a1043de3235d271cb74f5 Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 10:42:51 -0500 Subject: [PATCH 4/9] allow API gem to be released to major/minor versions without requiring dependency changes here --- CHANGELOG.md | 1 + Gemfile.lock | 2 +- shopify_app.gemspec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 513d9a45e..95d33652b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Unreleased * Make type param for webhooks route optional. This will fix a bug with CLI initiated webhooks.[1786](https://github.com/Shopify/shopify_app/pull/1786) * Fix redirecting to login when we catch a 401 response from Shopify, so that it can also handle cases where the app is already embedded when that happens.[1787](https://github.com/Shopify/shopify_app/pull/1787) * Always register webhooks with offline sessions.[1788](https://github.com/Shopify/shopify_app/pull/1788) +* Bumps minimum supported Ruby version to 3.0. Bumps `shopify_api` to 14.0 [1801](https://github.com/Shopify/shopify_app/pull/1801) 21.10.0 (January 24, 2024) ---------- diff --git a/Gemfile.lock b/Gemfile.lock index 65f52eff8..39b7fd51a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH jwt (>= 2.2.3) rails (> 5.2.1) redirect_safely (~> 1.0) - shopify_api (~> 14.0) + shopify_api (>= 14.0) sprockets-rails (>= 2.0.0) GEM diff --git a/shopify_app.gemspec b/shopify_app.gemspec index 8eea76c54..8ff448722 100644 --- a/shopify_app.gemspec +++ b/shopify_app.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("jwt", ">= 2.2.3") s.add_runtime_dependency("rails", "> 5.2.1") s.add_runtime_dependency("redirect_safely", "~> 1.0") - s.add_runtime_dependency("shopify_api", "~> 14.0") + s.add_runtime_dependency("shopify_api", ">= 14.0") s.add_runtime_dependency("sprockets-rails", ">= 2.0.0") s.add_development_dependency("byebug") From e62f92bf74b6246b0bfe960f6c6c1d4c4828ca4d Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 10:54:53 -0500 Subject: [PATCH 5/9] allow patches and minor releases of api without requiring releasing this gem --- Gemfile.lock | 2 +- shopify_app.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39b7fd51a..f863e7083 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH jwt (>= 2.2.3) rails (> 5.2.1) redirect_safely (~> 1.0) - shopify_api (>= 14.0) + shopify_api (~> 14) sprockets-rails (>= 2.0.0) GEM diff --git a/shopify_app.gemspec b/shopify_app.gemspec index 8ff448722..1f8763f19 100644 --- a/shopify_app.gemspec +++ b/shopify_app.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("jwt", ">= 2.2.3") s.add_runtime_dependency("rails", "> 5.2.1") s.add_runtime_dependency("redirect_safely", "~> 1.0") - s.add_runtime_dependency("shopify_api", ">= 14.0") + s.add_runtime_dependency("shopify_api", "~> 14") s.add_runtime_dependency("sprockets-rails", ">= 2.0.0") s.add_development_dependency("byebug") From dd8593735bd4ab66a5fb528889bdc1ce42e731fd Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 11:07:07 -0500 Subject: [PATCH 6/9] update rubocop ruby version --- .github/workflows/rubocop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index d4bcf6bf9..ba35b7af0 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 2.7 + - name: Set up Ruby 3.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.0 bundler-cache: true - name: Install gems run: | From 68257b4726fd64484aa28646da3c5833f071cf59 Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 11:19:12 -0500 Subject: [PATCH 7/9] ruby 3.2 for rubocop --- .github/workflows/rubocop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index ba35b7af0..3d14f5795 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 3.0 + - name: Set up Ruby 3.2 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.0 + ruby-version: 3.2 bundler-cache: true - name: Install gems run: | From 5b0c43445687941ad028644b1fefa72e423c6d86 Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 13:30:12 -0500 Subject: [PATCH 8/9] breaking changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d33652b..c6dfb87f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Unreleased * Make type param for webhooks route optional. This will fix a bug with CLI initiated webhooks.[1786](https://github.com/Shopify/shopify_app/pull/1786) * Fix redirecting to login when we catch a 401 response from Shopify, so that it can also handle cases where the app is already embedded when that happens.[1787](https://github.com/Shopify/shopify_app/pull/1787) * Always register webhooks with offline sessions.[1788](https://github.com/Shopify/shopify_app/pull/1788) -* Bumps minimum supported Ruby version to 3.0. Bumps `shopify_api` to 14.0 [1801](https://github.com/Shopify/shopify_app/pull/1801) +* ⚠️ [Breaking] Bumps minimum supported Ruby version to 3.0. Bumps `shopify_api` to 14.0 [1801](https://github.com/Shopify/shopify_app/pull/1801) 21.10.0 (January 24, 2024) ---------- From 38e1fe8545f033e6d417971996ac45cfb4bc8e64 Mon Sep 17 00:00:00 2001 From: Nelson Wittwer Date: Tue, 5 Mar 2024 13:34:09 -0500 Subject: [PATCH 9/9] reorder breaking chang --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6dfb87f5..119ea469a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ Unreleased ---------- +* ⚠️ [Breaking] Bumps minimum supported Ruby version to 3.0. Bumps `shopify_api` to 14.0 [1801](https://github.com/Shopify/shopify_app/pull/1801) * Make type param for webhooks route optional. This will fix a bug with CLI initiated webhooks.[1786](https://github.com/Shopify/shopify_app/pull/1786) * Fix redirecting to login when we catch a 401 response from Shopify, so that it can also handle cases where the app is already embedded when that happens.[1787](https://github.com/Shopify/shopify_app/pull/1787) * Always register webhooks with offline sessions.[1788](https://github.com/Shopify/shopify_app/pull/1788) -* ⚠️ [Breaking] Bumps minimum supported Ruby version to 3.0. Bumps `shopify_api` to 14.0 [1801](https://github.com/Shopify/shopify_app/pull/1801) 21.10.0 (January 24, 2024) ----------