From 3a510b0e7a4a1b970a204f69d4f00f0f389386d6 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 25 Oct 2023 21:49:27 +0000
Subject: [PATCH] Signing fixes [stage]

---
 dist/base.gradle     |  2 +-
 dist/jpackage.gradle | 12 ------------
 version              |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/dist/base.gradle b/dist/base.gradle
index 7441b93c..75e3bc78 100644
--- a/dist/base.gradle
+++ b/dist/base.gradle
@@ -189,7 +189,7 @@ if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 
             if (System.getenv("MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE_NAME") != null) {
                 exec {
-                    commandLine "$projectDir/misc/mac/notarize.sh", "$projectDir", rootProject.arch.toString(), rootProject.productName
+                    commandLine "$projectDir/misc/mac/sign_and_notarize.sh", "$projectDir", rootProject.arch.toString(), rootProject.productName
                 }
             }
         }
diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle
index 028aa52f..243c3c24 100644
--- a/dist/jpackage.gradle
+++ b/dist/jpackage.gradle
@@ -103,18 +103,6 @@ jlink {
             appVersion = rootProject.canonicalVersionString
         } else {
             icon = "logo/logo.icns"
-
-            def cert = System.getenv('MACOS_DEVELOPER_ID_APPLICATION_CERTIFICATE_USER_NAME')
-            if (cert != null) {
-                imageOptions += [
-                        '--mac-signing-key-user-name', cert
-                ]
-            }
-
-            imageOptions += [
-                    '--mac-sign'
-            ]
-
             resourceDir = file("${project.layout.buildDirectory.get()}/macos_resources")
             appVersion = macVersion
         }
diff --git a/version b/version
index 0a182f2e..9379cbf0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.7.2
\ No newline at end of file
+1.7.2-4
\ No newline at end of file