From 5d3efd3e670e2bf44b551960aca696a548f48fa5 Mon Sep 17 00:00:00 2001
From: FriwiDev <friwidev@gmail.com>
Date: Tue, 1 Nov 2022 05:48:59 +0100
Subject: [PATCH] Add signature to JavaAppLauncher

---
 .github/workflows/build-all.yml          | 4 ++--
 .github/workflows/build-macosx-amd64.yml | 2 +-
 .github/workflows/build-macosx-arm64.yml | 2 +-
 macosx_codesign.sh                       | 1 +
 macosx_notarize.sh                       | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 743108a..7838147 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -189,7 +189,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
       - name: Install Apple certificate
         env:
@@ -254,7 +254,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
       - name: Install Apple certificate
         env:
diff --git a/.github/workflows/build-macosx-amd64.yml b/.github/workflows/build-macosx-amd64.yml
index 6177db0..fc6da68 100644
--- a/.github/workflows/build-macosx-amd64.yml
+++ b/.github/workflows/build-macosx-amd64.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
       - name: Install Apple certificate
         env:
diff --git a/.github/workflows/build-macosx-arm64.yml b/.github/workflows/build-macosx-arm64.yml
index 7c806e6..f9258a1 100644
--- a/.github/workflows/build-macosx-arm64.yml
+++ b/.github/workflows/build-macosx-arm64.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
       - name: Install Apple certificate
         env:
diff --git a/macosx_codesign.sh b/macosx_codesign.sh
index c56105e..bf0f707 100755
--- a/macosx_codesign.sh
+++ b/macosx_codesign.sh
@@ -51,6 +51,7 @@ bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-m
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libjogl_mobile.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libnewt_head.dylib" "$2"
 bash macosx_codesign_zip.sh "$APP_DIR/$APP_NAME/Contents/Java/jogl-all-natives-macosx-universal.jar" "natives/macosx-universal/libjogl_desktop.dylib" "$2"
+codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME/Contents/MacOS/JavaAppLauncher"
 codesign --force --options runtime --entitlements "$ENTITLEMENTS_BROWSER" --sign "$2" --timestamp --verbose "$APP_DIR/$APP_NAME"
 bash macosx_notarize.sh "$APP_DIR/$APP_NAME" "$2" $3 org.jcef.jcef $4 $5 $6
 
diff --git a/macosx_notarize.sh b/macosx_notarize.sh
index 984d59c..35b3579 100755
--- a/macosx_notarize.sh
+++ b/macosx_notarize.sh
@@ -45,6 +45,7 @@ xcrun notarytool log $requestUUID \
                  --issuer $7 \
                  notarization.log
 cat notarization.log
+echo ""
 
 # staple
 xcrun stapler staple "$1"