Merge pull request #1515 from iangmaia/cleanup/deprecate-deliver-file

Deprecate `Deliverfile` in favor of `Fastfile`

fastlane/Fastfile

@@ -89,7 +89,7 @@ end
   lane :code_freeze do | options |
     old_version = ios_codefreeze_prechecks(options)
 
-    ios_bump_version_release()
+    ios_bump_version_release(skip_deliver: true)
     new_version = ios_get_app_version()
     extract_release_notes_for_version(version: new_version,
       release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
@@ -437,7 +437,7 @@ end
 
     testflight(
       skip_waiting_for_build_processing: true,
-      api_key_path: File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets', 'app_store_connect_fastlane_api_key.json')
+      api_key_path: APP_STORE_CONNECT_KEY_PATH
     )
 
     sh("rm ../Simplenote.ipa")
@@ -468,6 +468,31 @@ end
     end
   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_BUNDLE_IDENTIFIER,
+      app_version: ios_get_app_version,
+      skip_binary_upload: true,
+      screenshots_path: promo_screenshots_directory,
+      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: APP_STORE_CONNECT_KEY_PATH
+    )
+  end
+
   #####################################################################################
   # trigger_beta_build
   # -----------------------------------------------------------------------------------
@@ -886,38 +911,6 @@ end
     appstore_code_signing
   end
 
-  lane :upload_screenshots do |options|
-    # This uses the following env vars from the user env:
-    # DELIVER_USER
-    # DELIVER_APP_IDENTIFIER
-    # FASTLANE_PASSWORD
-    #
-    # and from the project env:
-    # FASTLANE_ITC_TEAM_ID
-    upload_to_app_store(
-      edit_live: false,
-      use_live_version: false,
-      screenshots_path: promo_screenshots_directory,
-      skip_binary_upload: true,
-      skip_metadata: true,
-      skip_app_version_update: true,
-
-      # Prechecks
-      run_precheck_before_submit: false,
-      precheck_include_in_app_purchases: false,
-
-      # Delete all the previous screenshots on ASC
-      overwrite_screenshots: true,
-      # Set this to true to skip the interactive confirmation of the
-      # screenshots that will be uploaded. Please, though, don't do it, unless
-      # you disable the overwrite option above. If we loose the screenshot that
-      # are on ASC, we might not be able to recover them, unless we checkout
-      # whichever version made them and generate them again.
-      force: false,
-      submit_for_review: false
-    )
-  end
-
 ########################################################################
 # Fastlane match code signing
 ########################################################################

fastlane/metadata/copyright.txt

@@ -0,0 +1 @@
+2023 Automattic

fastlane/metadata/default/privacy_url.txt

@@ -0,0 +1 @@
+https://simplenote.com/privacy/