macOS Signing bugfix

[skip ci]

Author: Stefterv

app/build.gradle.kts

@@ -4,6 +4,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Download
 import org.jetbrains.kotlin.fir.scopes.impl.overrides
+import java.io.FileOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 
 plugins{
     id("java")
@@ -47,7 +50,7 @@ compose.desktop {
 
         nativeDistributions{
             modules("jdk.jdi", "java.compiler", "jdk.accessibility")
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Pkg)
             packageName = "Processing"
 
             macOS{
@@ -233,7 +236,7 @@ tasks.register<Exec>("packageSnap"){
     commandLine("snapcraft")
 }
 tasks.register<Zip>("zipDistributable"){
-    dependsOn("createDistributable")
+    dependsOn("createDistributable", "setExecutablePermissions")
     group = "compose desktop"
 
     val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
@@ -388,7 +391,17 @@ tasks.register<Copy>("renameWindres") {
 tasks.register("signResources"){
     onlyIf { org.gradle.internal.os.OperatingSystem.current().isMacOsX }
     group = "compose desktop"
-    dependsOn("prepareAppResources")
+    dependsOn(
+        "includeCore",
+        "includeJavaMode",
+        "includeJdk",
+        "includeSharedAssets",
+        "includeProcessingExamples",
+        "includeProcessingWebsiteExamples",
+        "includeJavaModeResources",
+        "renameWindres"
+    )
+    finalizedBy("prepareAppResources")
 
     val resourcesPath = composeResources("")
 
@@ -415,28 +428,44 @@ tasks.register("signResources"){
                 from(zipTree(file))
                 into(tempDir)
             }
-            jars.add(tempDir)
+            file.delete()
         }
         fileTree(resourcesPath){
             include("**/bin/**")
             include("**/*.jnilib")
             include("**/*.dylib")
             include("**/*aarch64*")
             include("**/*x86_64*")
+            include("**/*ffmpeg*")
+            include("**/ffmpeg*/**")
             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","--options=runtime", "--sign", "Developer ID Application", file)
             }
         }
-    }
-    doLast {
         jars.forEach { file ->
-            zipTo(file.resolve(file.nameWithoutExtension), file)
+            FileOutputStream(File(file.parentFile, file.nameWithoutExtension)).use { fos ->
+                ZipOutputStream(fos).use { zos ->
+                    file.walkTopDown().forEach { fileEntry ->
+                        if (fileEntry.isFile) {
+                            // Calculate the relative path for the zip entry
+                            val zipEntryPath = fileEntry.relativeTo(file).path
+                            val entry = ZipEntry(zipEntryPath)
+                            zos.putNextEntry(entry)
+
+                            // Copy file contents to the zip
+                            fileEntry.inputStream().use { input ->
+                                input.copyTo(zos)
+                            }
+                            zos.closeEntry()
+                        }
+                    }
+                }
+            }
 
             file.deleteRecursively()
         }
@@ -457,7 +486,6 @@ afterEvaluate {
             "includeJavaModeResources",
             "renameWindres"
         )
-        finalizedBy()
     }
     tasks.register("setExecutablePermissions") {
         description = "Sets executable permissions on binaries in Processing.app resources"