Use shared resources

Found a better method that doesn't require copy the jar resources to a temporary folder

Author: Stefterv

app/build.gradle.kts

@@ -91,15 +91,12 @@ dependencies {
     implementation("com.charleskorn.kaml:kaml:0.65.0")
 }
 
-tasks.register<Copy>("addCore"){
+tasks.register<Copy>("copyCore"){
     dependsOn(project(":core").tasks.jar)
     from("../core/build/libs/")
     include("*.jar")
-    into("build/resources/main/core/library")
+    into(layout.buildDirectory.dir("resources-bundled/common/core/library"))
 }
-tasks.jar { dependsOn("addCore") }
-tasks.processResources{ finalizedBy("addCore") }
-
 tasks.register<Download>("downloadJDK") {
     val os: OperatingSystem = DefaultNativePlatform.getCurrentOperatingSystem()
     val arch: String = System.getProperty("os.arch").let { originalArch ->
@@ -143,8 +140,12 @@ tasks.register<Copy>("unzipJDK") {
     from(archive)
     into(layout.buildDirectory.dir("resources-bundled/common"))
 }
+tasks.register<Copy>("copyShared"){
+    from("../build/shared/")
+    into(layout.buildDirectory.dir("resources-bundled/common"))
+}
 afterEvaluate {
-    tasks.findByName("prepareAppResources")?.dependsOn("unzipJDK")
+    tasks.findByName("prepareAppResources")?.dependsOn("unzipJDK","copyShared", "copyCore")
     tasks.register("setExecutablePermissions") {
         description = "Sets executable permissions on binaries in Processing.app resources"
         group = "compose desktop"

app/src/processing/app/Platform.java

@@ -336,15 +336,9 @@ static public boolean isLinux() {
   @Deprecated
   static public File getContentFile(String name) {
     if (processingRoot == null) {
-      var url = Platform.class.getClassLoader().getResource("lib/defaults.txt");
-      if(url != null){
-        try {
-          processingRoot = Files.createTempDirectory("processing").toFile();
-          copyFromJar("/", processingRoot.toPath());
-          return new File(processingRoot, name);
-        } catch (IOException | URISyntaxException e) {
-          e.printStackTrace();
-        }
+      var resourcesDir = new File(System.getProperty("compose.application.resources.dir"));
+      if(resourcesDir.exists()) {
+        return new File(resourcesDir, name);
       }
       // Get the path to the .jar file that contains Base.class
       URL pathURL =
@@ -394,36 +388,6 @@ static public File getContentFile(String name) {
     return new File(processingRoot, name);
   }
 
-  public static void copyFromJar(String source, final Path target) throws URISyntaxException, IOException {
-    var resource = Platform.class.getResource("").toURI();
-    var fileSystem = FileSystems.newFileSystem(
-            resource,
-            Collections.<String, String>emptyMap()
-    );
-
-
-    final Path jarPath = fileSystem.getPath(source);
-
-    Files.walkFileTree(jarPath, new SimpleFileVisitor<Path>() {
-
-      private Path currentTarget;
-
-      @Override
-      public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-        currentTarget = target.resolve(jarPath.relativize(dir).toString());
-        Files.createDirectories(currentTarget);
-        return FileVisitResult.CONTINUE;
-      }
-
-      @Override
-      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        Files.copy(file, target.resolve(jarPath.relativize(file).toString()), StandardCopyOption.REPLACE_EXISTING);
-        return FileVisitResult.CONTINUE;
-      }
-
-    });
-  }
-
   static public File getJavaHome() {
     var resourcesDir = new File(System.getProperty("compose.application.resources.dir"));
     if(resourcesDir.exists()) {