Fixed Snap Store upload & macOS Binary signing

[skip ci]

Author: Stefterv

.github/workflows/release-gradle.yml

@@ -149,7 +149,6 @@ jobs:
           ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.appleID: ${{ secrets.PROCESSING_APPLE_ID }}
           ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.password: ${{ secrets.PROCESSING_APP_PASSWORD }}
           ORG_GRADLE_PROJECT_compose.desktop.mac.notarization.teamID: ${{ secrets.PROCESSING_TEAM_ID }}
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.PROCESSING_SNAPCRAFT_TOKEN }}
           ORG_GRADLE_PROJECT_snapname: ${{ vars.SNAP_NAME }}
 
       - name: Upload portables to release
@@ -165,3 +164,9 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           asset_name: processing-${{ needs.version.outputs.version }}-${{ matrix.os_prefix }}-${{ matrix.arch }}.${{ matrix.extension }}
           file: app/build/compose/binaries/main/${{ matrix.binary }}.${{ matrix.extension }}
+
+      - name: Upload snap to Snap Store
+        if: runner.os == 'Linux'
+        run: snapcraft upload app/build/compose/binaries/main/${{ matrix.binary }}.${{ matrix.extension }}
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.PROCESSING_SNAPCRAFT_TOKEN }}

app/build.gradle.kts

@@ -232,16 +232,6 @@ tasks.register<Exec>("packageSnap"){
     workingDir = distributable.destinationDir.dir("../").get().asFile
     commandLine("snapcraft")
 }
-tasks.register<Exec>("uploadSnap"){
-    onlyIf { org.gradle.internal.os.OperatingSystem.current().isLinux }
-    dependsOn("packageSnap")
-    group = "compose desktop"
-
-    val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
-    workingDir = distributable.destinationDir.dir("../").get().asFile
-
-    commandLine("snapcraft upload ${snapname}_${version}_${snaparch}.snap")
-}
 tasks.register<Zip>("zipDistributable"){
     dependsOn("createDistributable")
     group = "compose desktop"
@@ -275,7 +265,7 @@ afterEvaluate{
         ){
             dependsOn("notarizeDmg")
         }
-        dependsOn("packageSnap", "uploadSnap")
+        dependsOn("packageSnap")
     }
 }
 
@@ -395,7 +385,7 @@ tasks.register<Copy>("renameWindres") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
     into(dir)
 }
-tasks.register<Exec>("signResources"){
+tasks.register("signResources"){
     onlyIf { org.gradle.internal.os.OperatingSystem.current().isMacOsX }
     group = "compose desktop"
     dependsOn("prepareAppResources")
@@ -427,8 +417,23 @@ tasks.register<Exec>("signResources"){
             }
             jars.add(tempDir)
         }
+        fileTree(resourcesPath){
+            include("**/bin/**")
+            include("**/*.jnilib")
+            include("**/*.dylib")
+            include("**/*aarch64*")
+            include("**/*x86_64*")
+            exclude("jdk-*/**")
+            exclude("*.jar")
+            exclude("*.so")
+            exclude("*.dll")
+        }.forEach{ file ->
+            println("signign $file")
+            exec {
+                commandLine("codesign", "--timestamp", "--force", "--deep", "--sign", "Developer ID Application", file)
+            }
+        }
     }
-    commandLine("codesign","--timestamp", "--force","--deep", "--sign", "Developer ID Application", resourcesPath.get().asFile)
     doLast {
         jars.forEach { file ->
             zipTo(file.resolve(file.nameWithoutExtension), file)