From 15ce1f7cec424b25b429e6be1d8bcbecf1fbed88 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sat, 2 Dec 2023 12:30:35 -0500
Subject: [PATCH] Fix macos notarization

---
 .github/workflows/Build.yml                | 4 ++--
 .github/workflows/Preview.yml              | 6 +++---
 buildSrc/src/main/kotlin/TachideskTasks.kt | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 78097d72..b1e27c89 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -91,10 +91,10 @@ jobs:
           arguments: >
             ${{ matrix.build }}
             -Pcompose.desktop.mac.sign=true
-            -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY_SHORT }}
+            -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }}
             -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }}
             -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }}
-            -Pidentity="${{ secrets.APPLE_IDENTITY }}"
+            -Pcompose.desktop.mac.notarization.teamID=${{ secrets.APPLE_TEAM_ID }}
 
       - name: Sign APK
         uses: r0adkll/sign-android-release@v1
diff --git a/.github/workflows/Preview.yml b/.github/workflows/Preview.yml
index 1404fcde..53ea9c53 100644
--- a/.github/workflows/Preview.yml
+++ b/.github/workflows/Preview.yml
@@ -97,10 +97,10 @@ jobs:
           arguments: >
             ${{ matrix.build }}
             -Pcompose.desktop.mac.sign=true
-            -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY_SHORT }}
+            -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }}
             -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }}
             -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }}
-            -Pidentity="${{ secrets.APPLE_IDENTITY }}"
+            -Pcompose.desktop.mac.notarization.teamID=${{ secrets.APPLE_TEAM_ID }}
             -Ppreview="${{ env.COMMIT_COUNT }}"
             --stacktrace
 
@@ -195,7 +195,7 @@ jobs:
           body: |
             ### Commits
             https://github.com/Suwayomi/Tachidesk-JUI/compare/${{ env.PREV_RELEASE_SHA }}...${{ env.CURRENT_SHA }}
-            
+
             ${{ env.COMMIT_LOGS }}
 
       - name: Prune old releases
diff --git a/buildSrc/src/main/kotlin/TachideskTasks.kt b/buildSrc/src/main/kotlin/TachideskTasks.kt
index 9fe7621a..576b7cd6 100644
--- a/buildSrc/src/main/kotlin/TachideskTasks.kt
+++ b/buildSrc/src/main/kotlin/TachideskTasks.kt
@@ -55,7 +55,7 @@ private fun Task.onlyIfSigning(project: Project) {
     }
 }
 
-private fun Project.getSigningIdentity() = "${properties["identity"]}".trim('"')
+private fun Project.getSigningIdentity() = "${properties["compose.desktop.mac.signing.identity"].toString().trim('"')} (${properties["compose.desktop.mac.notarization.teamID"].toString().trim('"')})"
 
 private fun isSigning(properties: Map<String, Any?>) = properties["compose.desktop.mac.sign"].toString() == "true"
 
@@ -242,4 +242,4 @@ fun TaskContainerScope.registerTachideskTasks(project: Project) {
     named("processResources") {
         dependsOn(runAllTachideskTasks)
     }
-}
\ No newline at end of file
+}