Embed JDK

Author: Stefterv

app/build.gradle.kts

@@ -1,4 +1,6 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Download
 
 plugins{
     id("java")
@@ -7,6 +9,8 @@ plugins{
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.serialization)
+
+    id("de.undercouch.download") version "5.6.0"
 }
 
 group = rootProject.group
@@ -56,6 +60,7 @@ compose.desktop {
             jvmArgs(
                 "-Dapple.awt.application.appearance=system"
             )
+            appResourcesRootDir.set(layout.buildDirectory.dir("resources-bundled"))
         }
     }
 }
@@ -95,3 +100,25 @@ tasks.register<Copy>("addCore"){
 tasks.jar { dependsOn("addCore") }
 tasks.processResources{ finalizedBy("addCore") }
 
+val os: OperatingSystem = DefaultNativePlatform.getCurrentOperatingSystem()
+val arch: String = System.getProperty("os.arch")
+var platform = "linux"
+if (os.isWindows) {
+    platform = "windows"
+} else if (os.isMacOsX) {
+    platform = "mac"
+}
+tasks.register<Download>("downloadJDK"){
+    src("https://api.adoptium.net/v3/binary/latest/17/ga/${platform}/${arch}/jdk/hotspot/normal/eclipse?project=jdk")
+    dest(layout.buildDirectory.file("jdk-${platform}-${arch}.tar.gz"))
+    overwrite(false)
+}
+tasks.register<Copy>("unzipJDK"){
+    val dl = tasks.findByPath("downloadJDK") as Download
+    dependsOn(dl)
+    from(tarTree(dl.dest))
+    into(layout.buildDirectory.dir("resources-bundled/common"))
+}
+afterEvaluate {
+    tasks.findByName("prepareAppResources")?.dependsOn("unzipJDK")
+}

app/src/processing/app/Platform.java

@@ -30,6 +30,7 @@
 import java.net.URL;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.PosixFilePermission;
 import java.util.*;
 
 import com.sun.jna.platform.FileUtils;
@@ -424,6 +425,19 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
   }
 
   static public File getJavaHome() {
+    var resourcesDir = new File(System.getProperty("compose.application.resources.dir"));
+    if(resourcesDir.exists()) {
+      // find the jdk folder starting with jdk-17
+        var jdkFolder = Arrays.stream(resourcesDir.listFiles((dir, name) -> dir.isDirectory() && name.startsWith("jdk-17")))
+                .findFirst()
+                .orElse(null);
+        processDirectory(jdkFolder.toPath());
+        if(Platform.isMacOS()){
+            return new File(jdkFolder, "Contents/Home");
+        }
+        return jdkFolder;
+    }
+
     var home = System.getProperty("java.home");
     if(home != null){
       if(new File(home, "bin/java").exists()){
@@ -452,6 +466,49 @@ static public File getJavaHome() {
     return getContentFile("java");
   }
 
+  /**
+   * Depcated method to set permissions for all files in a directory. Hotfix for gradle embedded jdk.
+   */
+  @Deprecated
+  private static void processDirectory(Path directory) {
+    try {
+      Files.walk(directory)
+              .filter(Files::isRegularFile)
+              .filter(path -> {
+                String fileName = path.getFileName().toString();
+                Path relativePath = directory.relativize(path);
+                // Check if file is in a bin directory or has no extension
+                return relativePath.toString().contains("bin") ||
+                        !fileName.contains(".");
+              })
+              .forEach(file -> {
+                try {
+                  makeExecutable(file);
+                } catch (Exception e) {
+                  System.err.println("Failed to set permissions for " + file + ": " + e.getMessage());
+                }
+              });
+    } catch (Exception e) {
+      System.err.println("Error walking directory: " + e.getMessage());
+    }
+  }
+  
+  /**
+   * Depcated method to set permissions for all files in a directory. Hotfix for gradle embedded jdk.
+   */
+  @Deprecated
+  private static void makeExecutable(Path file) throws Exception {
+    try {
+      Set<PosixFilePermission> permissions = new HashSet<>(Files.getPosixFilePermissions(file));
+      permissions.add(PosixFilePermission.OWNER_EXECUTE);
+      permissions.add(PosixFilePermission.GROUP_EXECUTE);
+      permissions.add(PosixFilePermission.OTHERS_EXECUTE);
+      Files.setPosixFilePermissions(file, permissions);
+    } catch (UnsupportedOperationException e) {
+      // Fallback for non-POSIX systems
+      file.toFile().setExecutable(true, false);
+    }
+  }
 
   /** Get the path to the embedded Java executable. */
   static public String getJavaPath() {