Skip to content

Codesign clobbered when merging webgpu branch #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
catilac merged 2 commits into from
Jul 17, 2026
Merged

Codesign clobbered when merging webgpu branch #1549

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eea5a9
Codesign clobbered when merging webgpu branch
catilac Jul 17, 2026
265f47f
patch for gradle9
catilac Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import org.jetbrains.compose.ExperimentalComposeLibrary
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.gradle.process.ExecOperations
import java.io.FileOutputStream
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import javax.inject.Inject

// TODO: Update to 2.10.20 and add hot-reloading: https://github.com/JetBrains/compose-hot-reload

Expand Down Expand Up @@ -531,6 +533,11 @@ tasks.register("includeProcessingResources"){
finalizedBy("signResources")
}

// Project.exec was removed in Gradle 9; an injected ExecOperations is the replacement
interface ExecOps {
@get:Inject val execOps: ExecOperations
}

tasks.register("signResources") {
onlyIf {
OperatingSystem.current().isMacOsX
Expand All @@ -539,6 +546,9 @@ tasks.register("signResources") {
}
group = "compose desktop"
val resourcesPath = composeResources("")
val entitlements = file("macos/entitlements.plist").absolutePath

val execOps = objects.newInstance<ExecOps>().execOps

// find jars in the resources directory
val jars = mutableListOf<File>()
Expand Down Expand Up @@ -576,11 +586,10 @@ tasks.register("signResources") {
exclude("*.jar")
exclude("*.so")
exclude("*.dll")
}.forEach{ f ->
ProcessBuilder("codesign", "--timestamp", "--force", "--deep", "--options=runtime", "--sign", "Developer ID Application", f.absolutePath)
.inheritIO()
.start()
.waitFor()
}.forEach{ file ->
execOps.exec {
commandLine("codesign", "--timestamp", "--force", "--deep","--options=runtime", "--entitlements", entitlements, "--sign", "Developer ID Application", file)
}
}
jars.forEach { file ->
FileOutputStream(File(file.parentFile, file.nameWithoutExtension)).use { fos ->
Expand Down Expand Up @@ -631,6 +640,7 @@ tasks.register<Exec>("signApp"){
"--force",
"--deep",
"--options=runtime",
"--entitlements", file("macos/entitlements.plist").absolutePath,
"--sign", "Developer ID Application",
app)
}
Expand Down
Loading