U get default toolchain from context

Author: fvarrui

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

@@ -3,7 +3,13 @@
 import java.io.File;
 
 import org.gradle.api.Project;
+import org.gradle.api.internal.provider.Providers;
 import org.gradle.api.logging.Logger;
+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;
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
@@ -78,5 +84,24 @@ public Launch4jLibraryTask getLibraryTask() {
 	public void setLibraryTask(Launch4jLibraryTask libraryTask) {
 		this.libraryTask = libraryTask;
 	}
+	
+	/**
+	 * Returns project's default toolchain
+	 * @param project Gradle project
+	 * @return Default toolchain
+	 */
+	public File getDefaultToolchain() {
+		// 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 super.getDefaultToolchain();
+	}
 
 }

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

@@ -5,12 +5,6 @@
 import java.util.HashMap;
 
 import org.gradle.api.Project;
-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;
 
 import groovy.lang.Closure;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
@@ -55,7 +49,6 @@ public PackagePluginExtension(Project project) {
 		this.vmArgs = new ArrayList<>();
 		this.winConfig = new WindowsConfig();
 		this.outputDirectory = project.getBuildDir();
-		this.packagingJdk = getDefaultToolchain(project);
 	}
 
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {
@@ -81,24 +74,5 @@ public Manifest manifest(Closure<Manifest> closure) {
         project.configure(manifest, closure);
         return manifest;
     }
-    
-	/**
-	 * Returns project's default toolchain
-	 * @param project Gradle project
-	 * @return Default toolchain
-	 */
-	public 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/gradle/PackageTask.java

@@ -19,6 +19,7 @@
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
+import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
 import io.github.fvarrui.javapackager.packagers.PackagerFactory;
 
@@ -544,10 +545,9 @@ protected Packager createPackager() throws Exception {
 					.additionalModulePaths(defaultIfNull(additionalModulePaths, extension.getAdditionalModulePaths()))
 					.additionalResources(defaultIfNull(additionalResources, extension.getAdditionalResources()))
 					.administratorRequired(defaultIfNull(administratorRequired, extension.getAdministratorRequired()))
-					.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))
-					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk()))
 					.assetsDir(defaultIfNull(assetsDir, extension.getAssetsDir()))
 					.bundleJre(defaultIfNull(bundleJre, extension.getBundleJre()))
+					.classpath(defaultIfNull(classpath, extension.getClasspath()))
 					.copyDependencies(defaultIfNull(copyDependencies, extension.getCopyDependencies()))
 					.createTarball(defaultIfNull(createTarball, extension.getCreateTarball()))
 					.createZipball(defaultIfNull(createZipball, extension.getCreateZipball()))
@@ -573,10 +573,11 @@ protected Packager createPackager() throws Exception {
 					.organizationName(defaultIfNull(organizationName, extension.getOrganizationName()))
 					.organizationUrl(defaultIfNull(organizationUrl, extension.getOrganizationUrl()))
 					.outputDirectory(defaultIfNull(outputDirectory, extension.getOutputDirectory()))
-					.classpath(defaultIfNull(classpath, extension.getClasspath()))
+					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getContext().getDefaultToolchain()))
 					.runnableJar(defaultIfNull(runnableJar, extension.getRunnableJar()))
 					.useResourcesAsWorkingDir(defaultIfNull(useResourcesAsWorkingDir, extension.isUseResourcesAsWorkingDir()))
 					.url(defaultIfNull(url, extension.getUrl()))
+					.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))
 					.vmArgs(defaultIfNull(vmArgs, extension.getVmArgs()))
 					.winConfig(defaultIfNull(winConfig, extension.getWinConfig()));
 

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

@@ -85,4 +85,8 @@ public static GradleContext getGradleContext() {
 		return (GradleContext) context;
 	}
 
+	public File getDefaultToolchain() {
+		return new File(System.getProperty("java.home")); // Use java.home as fallback
+	}
+	
 }