From e4530e7bb5dc0cbc26342e351da3d3c69e40e48a Mon Sep 17 00:00:00 2001
From: mlch911 <mlch911@mluoc.tech>
Date: Mon, 2 May 2022 22:05:04 +0800
Subject: [PATCH] Update Fastfile

---
 .gitignore              |  1 +
 ios/fastlane/Fastfile   | 90 +++++++++++++++++++----------------------
 ios/fastlane/report.xml | 45 ++++++++++++++++++---
 3 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 669a137..cdcf1a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+ios/fastlane/report.xml
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index fced912..1b9632f 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -26,44 +26,46 @@ end
 
 platform :ios do
   lane :release do
-    bump_build()
-    build_ios_app(
-      workspace: ENV['WORKSPACE'],
-      configuration: 'Release',
-      scheme: ENV['SCHEME'],
-      clean: true,
-      xcargs: '-allowProvisioningUpdates',
-      include_symbols: true
-    )
-    deliver(
-      api_key: {
-        'key_id': 'NFBM52M2PY',
-        'issuer_id': '22e070fb-ba6d-4f93-bf6f-1a6415f583fe',
-        'key': '''-----BEGIN PRIVATE KEY-----
-        MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgD1Oi0HNrBDYZnpyB
-        FZkitTAPPYyVUNMd6PVTXKn1LJWgCgYIKoZIzj0DAQehRANCAAQ8z07wnl2HAwew
-        BWQsPHV/39P60ym+gN1u9SbD103BuiDhUaym1EAHFjFsNxaAD40SlpLaQBI+N+w2
-        xeCPq6ef
-        -----END PRIVATE KEY-----
-        ''',
-        'duration': 1200,
-        'in_house': false
-      },
-      ipa: lane_context[:IPA_OUTPUT_PATH],
-      username: ENV['USER_NAME'],
-      team_id: ENV['TEAM_ID'],
-      app_identifier: ENV['BUNDLE_ID'],
-      submit_for_review: true,
-      automatic_release: true,
-      phased_release: false,
-      force: true, # Skip HTMl report verification
-      skip_metadata: false,
-      skip_screenshots: false,
-      overwrite_screenshots: true,
-      skip_binary_upload: false,
-      precheck_include_in_app_purchases: false,
-      submission_information: { add_id_info_uses_idfa: false, export_compliance_uses_encryption: false }
-    )
+    begin
+      bump_build
+      build_ios_app(
+        workspace: ENV['WORKSPACE'],
+        configuration: 'Release',
+        scheme: ENV['SCHEME'],
+        clean: true,
+        xcargs: '-allowProvisioningUpdates',
+        include_symbols: true
+      )
+      app_store_connect_api_key(
+        key_id: 'NFBM52M2PY',
+        issuer_id: '22e070fb-ba6d-4f93-bf6f-1a6415f583fe',
+        key_filepath: '~/AuthKey_NFBM52M2PY.p8',
+        duration: 1200,
+        in_house: false
+      )
+      deliver(
+        ipa: lane_context[:IPA_OUTPUT_PATH],
+        username: ENV['USER_NAME'],
+        team_id: ENV['TEAM_ID'],
+        app_identifier: ENV['BUNDLE_ID'],
+        submit_for_review: true,
+        automatic_release: true,
+        phased_release: false,
+        force: true, # Skip HTMl report verification
+        skip_metadata: false,
+        skip_screenshots: false,
+        overwrite_screenshots: true,
+        skip_binary_upload: false,
+        precheck_include_in_app_purchases: false,
+        submission_information: { add_id_info_uses_idfa: false, export_compliance_uses_encryption: false }
+      )
+      clean_build_artifacts
+    rescue => exception
+      revert_bump_build
+      `git checkout . && git clean -df`
+      clean_build_artifacts
+      raise exception
+    end
   end
 
   lane :bump_version do
@@ -73,14 +75,9 @@ platform :ios do
       bump_type: 'patch',
       target: lane_context[:TARGET_NAME]
     )
-    increment_version_number_in_plist(
-      bump_type: 'patch',
-      target: lane_context[:WIDGET_TARGET_NAME]
-    )
     info_plist_path = get_info_plist_path(scheme: lane_context[:SCHEME])
-    widget_info_plist_path = get_info_plist_path(scheme: lane_context[:WIDGET_SCHEME])
     git_commit(
-      path: [info_plist_path, widget_info_plist_path],
+      path: [info_plist_path],
       message: 'Bump to next version',
       skip_git_hooks: true
     )
@@ -88,12 +85,9 @@ platform :ios do
 
   private_lane :bump_build do
     increment_build_number_in_plist(scheme: lane_context[:SCHEME])
-    increment_build_number_in_plist(scheme: lane_context[:WIDGET_SCHEME])
-
     info_plist_path = get_info_plist_path(scheme: lane_context[:SCHEME])
-    widget_info_plist_path = get_info_plist_path(scheme: lane_context[:WIDGET_SCHEME])
     git_commit(
-      path: [info_plist_path, widget_info_plist_path],
+      path: [info_plist_path],
       message: 'Increase Build Number',
       skip_git_hooks: true
     )
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
index 0e486fd..5f7236c 100644
--- a/ios/fastlane/report.xml
+++ b/ios/fastlane/report.xml
@@ -5,27 +5,62 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000166">
+      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.000237">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: ensure_git_status_clean" time="0.029487">
+      <testcase classname="fastlane.lanes" name="01: Switch to ios bump_build lane" time="7.6e-05">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: increment_version_number_in_plist" time="3.152635">
+      <testcase classname="fastlane.lanes" name="02: increment_build_number_in_plist" time="3.153205">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: get_info_plist_path" time="1.482511">
+      <testcase classname="fastlane.lanes" name="03: get_info_plist_path" time="1.511789">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: git_commit" time="0.018977">
+      <testcase classname="fastlane.lanes" name="04: git_commit" time="0.020483">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="05: Switch to ios tag_string lane" time="7.8e-05">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="06: Switch to ios version_string lane" time="6.1e-05">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="07: get_version_number_from_plist" time="1.536691">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="08: Switch to ios build_string lane" time="9.2e-05">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="09: get_build_number_from_plist" time="1.514093">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="10: add_git_tag" time="0.012862">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="11: build_ios_app" time="130.746772">
         
       </testcase>