Merge remote-tracking branch 'upstream/fix-jdk-requirement' into runner

Stefterv · Stefterv · commit f453eca87fd7 · 2025-03-27T18:03:34.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -369,6 +369,7 @@ tasks.register<Download>("includeJdk") {
             into(composeResources(""))
         }
     }
+    finalizedBy("prepareAppResources")
 }
 tasks.register<Copy>("includeSharedAssets"){
     from("../build/shared/")
@@ -526,7 +527,6 @@ afterEvaluate {
         dependsOn(
             "includeCore",
             "includeJavaMode",
-            "includeJdk",
             "includeSharedAssets",
             "includeProcessingExamples",
             "includeProcessingWebsiteExamples",
@@ -554,7 +554,7 @@ afterEvaluate {
         }
     }
     tasks.named("createDistributable").configure {
-        dependsOn("signResources")
+        dependsOn("signResources", "includeJdk")
         finalizedBy("setExecutablePermissions")
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ tasks.register<Download>("includeJdk") {`
`369`	`369`	`into(composeResources(""))`
`370`	`370`	`}`
`371`	`371`	`}`
	`372`	`+ finalizedBy("prepareAppResources")`
`372`	`373`	`}`
`373`	`374`	`tasks.register<Copy>("includeSharedAssets"){`
`374`	`375`	`from("../build/shared/")`
`@@ -526,7 +527,6 @@ afterEvaluate {`
`526`	`527`	`dependsOn(`
`527`	`528`	`"includeCore",`
`528`	`529`	`"includeJavaMode",`
`529`		`- "includeJdk",`
`530`	`530`	`"includeSharedAssets",`
`531`	`531`	`"includeProcessingExamples",`
`532`	`532`	`"includeProcessingWebsiteExamples",`
`@@ -554,7 +554,7 @@ afterEvaluate {`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`	`tasks.named("createDistributable").configure {`
`557`		`- dependsOn("signResources")`
	`557`	`+ dependsOn("signResources", "includeJdk")`
`558`	`558`	`finalizedBy("setExecutablePermissions")`
`559`	`559`	`}`
`560`		`-}`
	`560`	`+}`