Merge pull request #117 from keastrid/issue-112-toolchain

Use gradle toolchains for packaging jdk

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java

@@ -13,6 +13,12 @@
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.PackagerSettings;
+import org.gradle.api.internal.provider.Providers;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.provider.Provider;
+import org.gradle.jvm.toolchain.JavaLauncher;
+import org.gradle.jvm.toolchain.JavaToolchainService;
+import org.gradle.jvm.toolchain.JavaToolchainSpec;
 
 /**
  * JavaPackager plugin extension for Gradle  

src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java

@@ -7,11 +7,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputDirectory;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.Project;
+import org.gradle.api.internal.provider.Providers;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.*;
 
 import groovy.lang.Closure;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
@@ -21,6 +22,9 @@
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Packager;
 import io.github.fvarrui.javapackager.packagers.PackagerFactory;
+import org.gradle.jvm.toolchain.JavaLauncher;
+import org.gradle.jvm.toolchain.JavaToolchainService;
+import org.gradle.jvm.toolchain.JavaToolchainSpec;
 
 /**
  * Packaging task fro Gradle 
@@ -90,6 +94,18 @@ public File getAssetsDir() {
 	public void setAssetsDir(File assetsDir) {
 		this.assetsDir = assetsDir;
 	}
+
+	@InputDirectory
+	@Optional
+	private File packagingJdk;
+
+	public File getPackagingJdk() {
+		return packagingJdk;
+	}
+
+	public void setPackagingJdk(File packagingJdk) {
+		this.packagingJdk = packagingJdk;
+	}
 
 	@Input
 	@Optional
@@ -533,6 +549,7 @@ protected Packager createPackager() throws Exception {
 					.additionalResources(defaultIfNull(additionalResources, extension.getAdditionalResources()))
 					.administratorRequired(defaultIfNull(administratorRequired, extension.getAdministratorRequired()))
 					.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))
+					.packagingJdk(defaultIfNull(packagingJdk, getDefaultToolchain(getProject())))
 					.assetsDir(defaultIfNull(assetsDir, extension.getAssetsDir()))
 					.bundleJre(defaultIfNull(bundleJre, extension.getBundleJre()))
 					.copyDependencies(defaultIfNull(copyDependencies, extension.getCopyDependencies()))
@@ -568,5 +585,19 @@ protected Packager createPackager() throws Exception {
 					.winConfig(defaultIfNull(winConfig, extension.getWinConfig()));
 
 	}
+
+	private File getDefaultToolchain(Project project) {
+		// Default toolchain
+		JavaToolchainSpec toolchain = project.getExtensions().getByType(JavaPluginExtension.class).getToolchain();
+
+		// acquire a provider that returns the launcher for the toolchain
+		JavaToolchainService service = project.getExtensions().getByType(JavaToolchainService.class);
+		Provider<JavaLauncher> defaultLauncher = service.launcherFor(toolchain).orElse(Providers.notDefined());
+
+		if (defaultLauncher.isPresent()) {
+			return defaultLauncher.get().getMetadata().getInstallationPath().getAsFile();
+		}
+		return new File(System.getProperty("java.home")); // Use java.home as fallback
+	}
 
 }

src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java

@@ -45,7 +45,7 @@ protected File doApply(Packager packager) throws Exception {
 		List<String> additionalModules = packager.getAdditionalModules();
 		List<File> additionalModulePaths = packager.getAdditionalModulePaths();
 
-		File currentJdk = new File(System.getProperty("java.home"));
+		File currentJdk = packager.packagingJdk;
 
 		Logger.infoIndent("Bundling JRE ... with " + currentJdk);
 

src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java

@@ -55,6 +55,15 @@ public class PackagerSettings {
 	protected String jreMinVersion;
 	protected Manifest manifest;
 	protected List<File> additionalModulePaths;
+	protected File packagingJdk;
+
+	public File getPackagingJdk() {
+		return packagingJdk;
+	}
+
+	public void setPackagingJdk(File packagingJdk) {
+		this.packagingJdk = packagingJdk;
+	}
 
 	public File getOutputDirectory() {
 		return outputDirectory;
@@ -219,6 +228,11 @@ public PackagerSettings outputDirectory(File outputDirectory) {
 		return this;
 	}
 
+	public PackagerSettings packagingJdk(File packagingJdk) {
+		this.packagingJdk = packagingJdk;
+		return this;
+	}
+
 	public PackagerSettings licenseFile(File licenseFile) {
 		this.licenseFile = licenseFile;
 		return this;