16: Fix multi-release Jar setup

jjohannes · Jan 23, 2024 · ce77c84 · ce77c84
1 parent 8459730
commit ce77c84
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/16_Source_Sets/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts b/16_Source_Sets/my-build-logic/java-plugins/src/main/kotlin/my-java-application.gradle.kts
@@ -2,3 +2,12 @@ plugins {
     id("my-java-base")
     id("application")
 }
+
+tasks.register<JavaExec>("runJava17") {
+    classpath = configurations.runtimeClasspath.get() + files(tasks.jar)
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    })
+    mainClass = application.mainClass
+    group = "application"
+}
diff --git a/16_Source_Sets/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts b/16_Source_Sets/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts
@@ -34,10 +34,12 @@ jvm.registerJvmLanguageSourceDirectory(sourceSets.main.get(), "java17") {
         classpath = sourceSets.main.get().compileClasspath
         doLast {
             val destRoot = destinationDirectory.get().asFile
-            val destVersion17 = File(destRoot, "META-INF/version/17").also { it.mkdirs() }
+            val destVersions = File(destRoot, "META-INF/versions/17").also { it.mkdirs() }
+            destVersions.deleteRecursively()
+            destVersions.mkdirs()
             destRoot.listFiles()?.forEach {
                 if (it.name != "META-INF") {
-                    Files.move(it.toPath(), File(destVersion17, it.name).toPath())
+                    Files.move(it.toPath(), File(destVersions, it.name).toPath())
                 }
             }
         }

diff --git a/16_Source_Sets/my-project/app/src/main/java/myproject/MyApplication.java b/16_Source_Sets/my-project/app/src/main/java/myproject/MyApplication.java
@@ -9,6 +9,7 @@ public final class MyApplication {
 
     public static void main(final String[] args) {
         Service.printMessage(new MessageModel(readeMessageTxt()));
+        Service.printMessage(new MessageModel("Java 11"));
     }
 
     static String readeMessageTxt() {

diff --git a/16_Source_Sets/my-project/app/src/main/java17/.gitignore b/16_Source_Sets/my-project/app/src/main/java17/.gitignore
diff --git a/16_Source_Sets/my-project/app/src/main/java17/myproject/MyApplication.java b/16_Source_Sets/my-project/app/src/main/java17/myproject/MyApplication.java
@@ -0,0 +1,20 @@
+package myproject;
+
+import myproject.data.MessageModel;
+import myproject.services.Service;
+
+import java.util.Scanner;
+
+public final class MyApplication {
+
+    public static void main(final String[] args) {
+        Service.printMessage(new MessageModel(readeMessageTxt()));
+        Service.printMessage(new MessageModel("Java 17"));
+    }
+
+    static String readeMessageTxt() {
+        //noinspection ConstantConditions
+        return new Scanner(MyApplication.class.getResourceAsStream("message.txt"))
+                .useDelimiter("\n").next();
+    }
+}