Create custom javaLauncher

Author: MartelliEnrico

build.gradle

@@ -1,4 +1,3 @@
-import org.apache.tools.ant.taskdefs.condition.Os
 import com.github.stickerifier.stickerify.JlinkTask
 
 plugins {
@@ -59,12 +58,8 @@ def jlink = tasks.register('jlink', JlinkTask) {
 }
 
 test {
-    dependsOn jlink
-
-    def jre = jlink.map { it.jreDir }
-    inputs.dir jre
-
-    executable = jre.get().file(Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\java.exe' : 'bin/java').get()
+    inputs.dir jlink.get().outputDirectory
+    javaLauncher = JlinkTask.getJavaLauncher(jlink)
 
     useJUnitPlatform()
     finalizedBy jacocoTestReport

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkJavaLauncher.java

@@ -0,0 +1,19 @@
+package com.github.stickerifier.stickerify;
+
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.Provider;
+import org.gradle.jvm.toolchain.JavaInstallationMetadata;
+import org.gradle.jvm.toolchain.JavaLauncher;
+import org.jetbrains.annotations.NotNull;
+
+public record JlinkJavaLauncher(Provider<JavaInstallationMetadata> metadata, Provider<RegularFile> executablePath) implements JavaLauncher {
+	@Override
+	public @NotNull JavaInstallationMetadata getMetadata() {
+		return metadata.get();
+	}
+
+	@Override
+	public @NotNull RegularFile getExecutablePath() {
+		return executablePath.get();
+	}
+}

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

@@ -1,20 +1,23 @@
 package com.github.stickerifier.stickerify;
 
-import org.apache.tools.ant.taskdefs.condition.Os;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.TaskProvider;
+import org.gradle.jvm.toolchain.JavaCompiler;
 import org.gradle.jvm.toolchain.JavaLauncher;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.process.ExecOperations;
+import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
@@ -30,10 +33,10 @@ public abstract class JlinkTask extends DefaultTask {
 	public abstract ListProperty<String> getModules();
 
 	@OutputDirectory
-	public abstract DirectoryProperty getJreDir();
+	public abstract DirectoryProperty getOutputDirectory();
 
 	@Nested
-	protected abstract Property<JavaLauncher> getJavaLauncher();
+	protected abstract Property<JavaCompiler> getJavaCompiler();
 
 	@Inject
 	protected abstract JavaToolchainService getJavaToolchainService();
@@ -47,20 +50,21 @@ public abstract class JlinkTask extends DefaultTask {
 	public JlinkTask() {
 		getOptions().convention(List.of());
 		getModules().convention(List.of("ALL-MODULE-PATH"));
-		getJreDir().convention(getProject().getLayout().getBuildDirectory().dir("jre"));
+		getOutputDirectory().convention(getProject().getLayout().getBuildDirectory().dir("jlink"));
 
 		var toolchain = getProject().getExtensions().getByType(JavaPluginExtension.class).getToolchain();
-		getJavaLauncher().convention(getJavaToolchainService().launcherFor(toolchain));
+		getJavaCompiler().convention(getJavaToolchainService().compilerFor(toolchain));
 	}
 
 	@TaskAction
 	public void performAction() {
-		var installationPath = getJavaLauncher().get().getMetadata().getInstallationPath();
+		var installationPath = getJavaCompiler().get().getMetadata().getInstallationPath();
 
-		var jlink = installationPath.file(Os.isFamily(Os.FAMILY_WINDOWS) ? "bin\\jlink.exe" : "bin/jlink");
+		var jlink = installationPath.file("bin/jlink");
 		var jmods = installationPath.dir("jmods");
 
-		getFs().delete(deleteSpec -> deleteSpec.delete(getJreDir()));
+		var jlinkOutput = getOutputDirectory().dir("jre").get().getAsFile();
+		getFs().delete(deleteSpec -> deleteSpec.delete(jlinkOutput));
 
 		var stdout = new ByteArrayOutputStream();
 		var stderr = new ByteArrayOutputStream();
@@ -77,7 +81,7 @@ public void performAction() {
 			commandLine.add("--add-modules");
 			commandLine.add(String.join(",", getModules().get()));
 			commandLine.add("--output");
-			commandLine.add(getJreDir().get().toString());
+			commandLine.add(jlinkOutput.toString());
 
 			execSpec.setCommandLine(commandLine);
 
@@ -99,4 +103,11 @@ public void performAction() {
 		result.assertNormalExitValue();
 	}
 
+	public static Provider<JavaLauncher> getJavaLauncher(TaskProvider<@NotNull JlinkTask> taskProvider) {
+		return taskProvider.map(jlinkTask -> new JlinkJavaLauncher(
+				jlinkTask.getJavaCompiler().map(JavaCompiler::getMetadata),
+				jlinkTask.getOutputDirectory().file("jre/bin/java")
+		));
+	}
+
 }