From 5857f00cc846d769ce6755e60f99868ff74fa99e Mon Sep 17 00:00:00 2001
From: Andrew Sazonov <andrew.sazonov@icloud.com>
Date: Fri, 14 Jun 2024 12:40:09 +0200
Subject: [PATCH] Migrate from altool to notarytool

* altool is depricated
* Migration instruction https://developer.apple.com/documentation/technotes/tn3147-migrating-to-the-latest-notarization-tool
---
 tools/Scripts/SignAppInstaller.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/Scripts/SignAppInstaller.py b/tools/Scripts/SignAppInstaller.py
index 6f7b53f..0e7de66 100644
--- a/tools/Scripts/SignAppInstaller.py
+++ b/tools/Scripts/SignAppInstaller.py
@@ -192,13 +192,14 @@ def signMacos():
         try:
             sub_message = f'notarize app installer "{CONFIG.setup_zip_path_short}" for distribution outside of the Mac App Store' # Notarize the app by submitting a zipped package of the app bundle
             Functions.run(
-                'xcrun', 'altool',
-                '--notarize-app',
-                '--file', CONFIG.setup_zip_path_short,
-                '--type', 'macos',
-                '--primary-bundle-id', CONFIG['ci']['codesign']['bundle_id'],
-                '--username', APPSTORE_NOTARIZATION_USERNAME,
-                '--password', APPSTORE_NOTARIZATION_PASSWORD)
+                'xcrun', 'notarytool', 'submit',
+                '--apple-id', APPSTORE_NOTARIZATION_USERNAME,
+                '--team-id', 'W2AG9MPZ43',
+                '--password', APPSTORE_NOTARIZATION_PASSWORD,
+                '--verbose',
+                '--progress',
+                '--wait',
+                CONFIG.setup_zip_path_short)
         except Exception as sub_exception:
             Functions.printFailMessage(sub_message, sub_exception)
             sys.exit(1)