From 3198a5fae0a218416c3d99a21669894a15c3fe06 Mon Sep 17 00:00:00 2001
From: CyberFlame <cyberflameu@gmail.com>
Date: Thu, 27 Jul 2023 12:27:33 +1200
Subject: [PATCH 1/2] migrate from altool to notarytool

---
 build/build.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 194261143..17b1d9ba3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -902,16 +902,14 @@
     <!-- https://developer.apple.com/account/ -->
 
     <exec executable="/usr/bin/xcrun" dir="macos" failonerror="true">
-      <arg value="altool" />
-      <arg value="--notarize-app" />
+      <arg value="notarytool" />
+      <arg value="submit" />
 
       <!-- spew a bunch of useless garbage that has nothing to do with success/failure -->
       <!-- <arg value="- -verbose" /> -->
 
-      <arg value="--primary-bundle-id" />
-      <arg value="org.processing.app" />
 
-      <arg value="--username" />
+      <arg value="--apple-id" />
       <arg value="${env.PROCESSING_APPLE_ID}" />
 
       <arg value="--password" />
@@ -920,14 +918,13 @@
       <arg value="--team-id" />
       <arg value="${env.PROCESSING_TEAM_ID}" />
 
-      <arg value="--file" />
       <arg value="${dist.filename}" />
     </exec>
 
     <echo>
       Check on notarization status with:
 
-      xcrun altool -u $PROCESSING_APPLE_ID -p $PROCESSING_APP_PASSWORD --notarization-info [the RequestUUID above]
+      xcrun notarytool info --apple-id $PROCESSING_APPLE_ID --password $PROCESSING_APP_PASSWORD [the RequestUUID above]
     </echo>
   </target>
 

From ef2c65312d951ccbb904ed3d6d997eea44b32538 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Thu, 27 Jul 2023 10:35:01 -0400
Subject: [PATCH 2/2] one last edit for notarization updates

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index 17b1d9ba3..b20fa8357 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -924,7 +924,7 @@
     <echo>
       Check on notarization status with:
 
-      xcrun notarytool info --apple-id $PROCESSING_APPLE_ID --password $PROCESSING_APP_PASSWORD [the RequestUUID above]
+      xcrun notarytool info --apple-id $PROCESSING_APPLE_ID --password $PROCESSING_APP_PASSWORD --team-id $PROCESSING_TEAM_ID [the Submission ID above]
     </echo>
   </target>