U refactoring and extension support for packaginJdk property

Author: fvarrui

build.gradle

@@ -50,7 +50,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.6'
     implementation 'org.apache.commons:commons-collections4:4.1'
     implementation 'org.apache.velocity:velocity-engine-core:2.0'
-	implementation 'edu.sc.seis.launch4j:launch4j:2.5.0' 
+	implementation 'io.github.fvarrui:gradle-launch4j:2.4.7' 
 	implementation 'com.netflix.nebula:gradle-ospackage-plugin:8.4.1'
 	implementation 'net.jsign:jsign-core:3.1'
 

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

@@ -20,6 +20,7 @@ protected Packager createPackager() throws Exception {
 				.additionalResources(extension.getAdditionalResources())
 				.administratorRequired(extension.getAdministratorRequired())
 				.version(defaultIfNull(extension.getVersion(), getProject().getVersion().toString()))
+				.packagingJdk(extension.getPackagingJdk())
 				.assetsDir(extension.getAssetsDir())
 				.bundleJre(extension.getBundleJre())
 				.copyDependencies(extension.getCopyDependencies())

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

@@ -1,13 +1,11 @@
 package io.github.fvarrui.javapackager.gradle;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 
-import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
 
+import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
 

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

@@ -5,6 +5,12 @@
 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;
@@ -13,12 +19,6 @@
 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  
@@ -54,7 +54,8 @@ public PackagePluginExtension(Project project) {
 		this.useResourcesAsWorkingDir = true;
 		this.vmArgs = new ArrayList<>();
 		this.winConfig = new WindowsConfig();
-		this.outputDirectory = project.getBuildDir();		
+		this.outputDirectory = project.getBuildDir();
+		this.packagingJdk = getDefaultToolchain(project);
 	}
 
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {
@@ -80,5 +81,24 @@ 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

@@ -7,12 +7,11 @@
 import java.util.List;
 import java.util.Map;
 
-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 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 groovy.lang.Closure;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
@@ -22,9 +21,6 @@
 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 
@@ -549,7 +545,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())))
+					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk()))
 					.assetsDir(defaultIfNull(assetsDir, extension.getAssetsDir()))
 					.bundleJre(defaultIfNull(bundleJre, extension.getBundleJre()))
 					.copyDependencies(defaultIfNull(copyDependencies, extension.getCopyDependencies()))
@@ -585,19 +581,5 @@ 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
-	}
 
 }