Merge branch 'issue-112'

fvarrui · fvarrui · commit 92476cdedafa · 2021-07-20T17:39:16.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -12,6 +12,9 @@ plugins {
 repositories {
 	mavenLocal()
 	mavenCentral()
+	maven { 
+		url 'https://plugins.gradle.org/m2/'
+	}
 }
 
 gradlePlugin {
@@ -47,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 'io.github.fvarrui:gradle-launch4j:2.4.7'
+	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'
 	
@@ -116,6 +119,12 @@ task generatePluginDescriptor(type: JavaExec, dependsOn: compileJava) {
                .mavenInstaller
                .pom
                .withXml {
+                    asNode().appendNode('repositories').appendNode('repository')
+                    		.with {
+                                appendNode('id', 'gradle')
+                                appendNode('name', 'Gradle Plugin Portal')
+                                appendNode('url', 'https://plugins.gradle.org/m2/')                    		
+                    		}
                     asNode().appendNode('build')
                             .with {
                                 appendNode('directory', directory)
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExe.java b/src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExe.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.HashSet;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -53,7 +52,8 @@ protected File doApply(Packager packager) throws Exception {
 		
 		String jarPath = winConfig.isWrapJar() ? genericJar.getAbsolutePath() : jarFile.getName();
 		
-		Launch4jLibraryTask l4jTask = createLaunch4jTask();
+		Launch4jLibraryTask l4jTask = Context.getGradleContext().getLibraryTask();
+		l4jTask.getOutputs().upToDateWhen(task -> false);
 		l4jTask.setHeaderType(winConfig.getHeaderType().toString());
 		l4jTask.setJar(jarPath);
 		l4jTask.setDontWrapJar(!winConfig.isWrapJar());
@@ -87,10 +87,6 @@ protected File doApply(Packager packager) throws Exception {
 		return executable;
 	}
 	
-	private Launch4jLibraryTask createLaunch4jTask() {
-		return Context.getGradleContext().getProject().getTasks().create("launch4j_" + UUID.randomUUID(), Launch4jLibraryTask.class);
-	}
-	
 	private void createAssets(WindowsPackager packager) throws Exception {
 		
 		File manifestFile = packager.getManifestFile();
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/DefaultPackageTask.java b/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())
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java b/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java
@@ -5,6 +5,7 @@
 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;
 
@@ -14,6 +15,8 @@
 public class GradleContext extends Context<Logger> {
 
 	private Project project;
+
+	private Launch4jLibraryTask libraryTask;
 	
 	public GradleContext(Project project) {
 		super();
@@ -69,4 +72,12 @@ public File createWindowsExe(Packager packager) throws Exception {
 		return new CreateWindowsExe().apply(packager);	
 	}
 
+	public Launch4jLibraryTask getLibraryTask() {
+		return libraryTask;
+	}
+
+	public void setLibraryTask(Launch4jLibraryTask libraryTask) {
+		this.libraryTask = libraryTask;
+	}
+
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePlugin.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePlugin.java
@@ -1,9 +1,11 @@
 package io.github.fvarrui.javapackager.gradle;
 
+import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
+import io.github.fvarrui.javapackager.packagers.Context;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
-import io.github.fvarrui.javapackager.packagers.Context;
+import java.util.UUID;
 
 /**
  * JavaPackager Gradle plugin
@@ -25,6 +27,8 @@ public void apply(Project project) {
 		project.getExtensions().create(SETTINGS_EXT_NAME, PackagePluginExtension.class, project);
 		project.getTasks().create(PACKAGE_TASK_NAME, DefaultPackageTask.class).dependsOn("build");
 
+		Context.getGradleContext().setLibraryTask(project.getTasks().create("launch4j_" + UUID.randomUUID(), Launch4jLibraryTask.class));
+
 	}
 
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java b/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;
@@ -48,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) {
@@ -74,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
+	}
 
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
@@ -90,6 +90,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 +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, extension.getPackagingJdk()))
 					.assetsDir(defaultIfNull(assetsDir, extension.getAssetsDir()))
 					.bundleJre(defaultIfNull(bundleJre, extension.getBundleJre()))
 					.copyDependencies(defaultIfNull(copyDependencies, extension.getCopyDependencies()))
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java b/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);
 		
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java b/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;
