Merge branch 'master' into shop-host-concern

CHANGELOG.md

@@ -1,4 +1,4 @@
-Unreleased
+18.1.0 (Jan 28, 2022)
 ----------
 * Support Rails 7 [#1354](https://github.com/Shopify/shopify_app/pull/1354)
 * Fix webhooks handling in Ruby 3 [#1342](https://github.com/Shopify/shopify_app/pull/1342)

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_app (18.0.4)
+    shopify_app (18.1.0)
       browser_sniffer (~> 1.4.0)
       jwt (>= 2.2.3)
       omniauth-rails_csrf_protection
@@ -110,7 +110,7 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.2)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
@@ -119,7 +119,7 @@ GEM
     faraday-retry (1.0.3)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    graphql (1.13.4)
+    graphql (1.13.6)
     graphql-client (0.17.0)
       activesupport (>= 3.0)
       graphql (~> 1.10)
@@ -235,11 +235,10 @@ GEM
       rubocop (~> 1.4)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.5)
-    shopify_api (9.5)
-      activeresource (>= 4.1.0, < 6.0.0)
+    shopify_api (9.5.1)
+      activeresource (>= 4.1.0)
       graphql-client
       rack
-      webrick
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -256,7 +255,6 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

lib/shopify_app/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ShopifyApp
-  VERSION = '18.0.4'
+  VERSION = '18.1.0'
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify_app",
-  "version": "18.0.4",
+  "version": "18.1.0",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",