From 4f6a4bab772d1ddc0f78c9d040a463a5ef622d14 Mon Sep 17 00:00:00 2001
From: Ian Guedes Maia <ian.guedesmaia@getbux.com>
Date: Mon, 6 Feb 2023 13:49:02 +0100
Subject: [PATCH 1/3] Deprecate `Deliverfile` in favor of `Fastfile`

---
 fastlane/Deliverfile | 30 ------------------------------
 fastlane/Fastfile    | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 fastlane/Deliverfile

diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
deleted file mode 100644
index 682ccaf2ec4..00000000000
--- a/fastlane/Deliverfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-# The Deliverfile allows you to store various App Store Connect metadata
-# For more information, check out the docs
-# https://docs.fastlane.tools/actions/deliver/
-
-########################################
-# App Metadata
-########################################
-
-# The Bundle Identifier in App Store Connect
-app_identifier 'com.automattic.woocommerce'
-
-# This folder has to include one folder for each language
-screenshots_path './fastlane/promo_screenshots/'
-
-# Make sure to update these keys for a new version
-app_version "12.2"
-
-team_id '299112'
-
-skip_binary_upload true
-overwrite_screenshots true
-phased_release true
-
-# Use the decrypted API Key for authentication
-api_key_path '.configure-files/app_store_connect_fastlane_api_key.json'
-
-# Not supported when using the API, and we don't use IAP anyway
-precheck_include_in_app_purchases false
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 9a76dd38b3b..2bb9bf6f276 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -585,6 +585,31 @@ platform :ios do
     )
   end
 
+  # Upload the localized metadata (from `fastlane/metadata/`) to App Store Connect
+  #
+  # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC
+  #
+  desc 'Upload the localized metadata to App Store Connect, optionally including screenshots.'
+  lane :update_metadata_on_app_store_connect do |options|
+    # Skip screenshots by default. The naming is "with" to make it clear that
+    # callers need to opt-in to adding screenshots. The naming of the deliver
+    # (upload_to_app_store) parameter, on the other hand, uses the skip verb.
+    with_screenshots = options.fetch(:with_screenshots, false)
+    skip_screenshots = !with_screenshots
+
+    upload_to_app_store(
+      app_identifier: APP_STORE_VERSION_BUNDLE_IDENTIFIER,
+      app_version: ios_get_app_version,
+      skip_binary_upload: true,
+      screenshots_path: File.join(FASTLANE_DIR, 'promo_screenshots'),
+      skip_screenshots: skip_screenshots,
+      overwrite_screenshots: true, # won't have effect if `skip_screenshots` is true
+      phased_release: true,
+      precheck_include_in_app_purchases: false,
+      api_key_path: ASC_KEY_PATH
+    )
+  end
+
   #####################################################################################
   # register_new_device
   # -----------------------------------------------------------------------------------

From 616fb46fc565fd4b2f43d4ab81e0dd49b18ab341 Mon Sep 17 00:00:00 2001
From: Ian Guedes Maia <ian.guedesmaia@getbux.com>
Date: Fri, 10 Feb 2023 17:35:56 +0100
Subject: [PATCH 2/3] Add `team_id` parameter when uploading metadata to ASC

---
 fastlane/Fastfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2bb9bf6f276..1a9d5087251 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -600,6 +600,7 @@ platform :ios do
     upload_to_app_store(
       app_identifier: APP_STORE_VERSION_BUNDLE_IDENTIFIER,
       app_version: ios_get_app_version,
+      team_id: '299112',
       skip_binary_upload: true,
       screenshots_path: File.join(FASTLANE_DIR, 'promo_screenshots'),
       skip_screenshots: skip_screenshots,

From fb64010bed1cf283a4568b7ce3c92106edd6154e Mon Sep 17 00:00:00 2001
From: Ian Guedes Maia <ian.guedesmaia@getbux.com>
Date: Fri, 10 Feb 2023 18:22:09 +0100
Subject: [PATCH 3/3] Update the bump version call to reflect that we no longer
 use the Deliverfile

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1a9d5087251..da1fdf0747a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -172,7 +172,7 @@ platform :ios do
   lane :code_freeze do |options|
     ios_codefreeze_prechecks(options)
 
-    ios_bump_version_release(skip_glotpress: true)
+    ios_bump_version_release(skip_glotpress: true, skip_deliver: true)
     new_version = ios_get_app_version
     extract_release_notes_for_version(
       version: new_version,