U get default toolchain from javapluginextension only if gradle version is 7 or higher

Author: fvarrui

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

@@ -15,43 +15,47 @@ protected Packager createPackager() throws Exception {
 
 		PackagePluginExtension extension = getProject().getExtensions().findByType(PackagePluginExtension.class);
 
-		return (Packager) PackagerFactory.createPackager(extension.getPlatform())
-				.additionalModules(extension.getAdditionalModules())
-				.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())
-				.createTarball(extension.getCreateTarball())
-				.createZipball(extension.getCreateZipball())
-				.customizedJre(extension.getCustomizedJre())
-				.description(extension.getDescription())
-				.displayName(extension.getDisplayName())
-				.envPath(extension.getEnvPath())
-				.extra(extension.getExtra())
-				.generateInstaller(extension.getGenerateInstaller())
-				.iconFile(extension.getIconFile())
-				.jdkPath(extension.getJdkPath())
-				.jreDirectoryName(extension.getJreDirectoryName())
-				.jreMinVersion(extension.getJreMinVersion())
-				.jrePath(extension.getJrePath())
-				.licenseFile(extension.getLicenseFile())
-				.linuxConfig(extension.getLinuxConfig())
-				.macConfig(extension.getMacConfig())
-				.mainClass(extension.getMainClass())
-				.modules(extension.getModules())
-				.name(extension.getName())
-				.organizationEmail(extension.getOrganizationEmail())
-				.organizationName(extension.getOrganizationName())
-				.organizationUrl(extension.getOrganizationUrl())
-				.outputDirectory(extension.getOutputDirectory())
-				.runnableJar(extension.getRunnableJar())
-				.useResourcesAsWorkingDir(extension.isUseResourcesAsWorkingDir())
-				.url(extension.getUrl())
-				.vmArgs(extension.getVmArgs())
-				.winConfig(extension.getWinConfig());
+		return 
+			(Packager) PackagerFactory
+				.createPackager(extension.getPlatform())
+					.additionalModules(extension.getAdditionalModules())
+					.additionalModulePaths(extension.getAdditionalModulePaths())
+					.additionalResources(extension.getAdditionalResources())
+					.administratorRequired(extension.getAdministratorRequired())
+					.assetsDir(extension.getAssetsDir())
+					.bundleJre(extension.getBundleJre())
+					.copyDependencies(extension.getCopyDependencies())
+					.createTarball(extension.getCreateTarball())
+					.createZipball(extension.getCreateZipball())
+					.customizedJre(extension.getCustomizedJre())
+					.description(extension.getDescription())
+					.displayName(extension.getDisplayName())
+					.envPath(extension.getEnvPath())
+					.extra(extension.getExtra())
+					.fileAssociations(extension.getFileAssociations())
+					.generateInstaller(extension.getGenerateInstaller())
+					.jdkPath(extension.getJdkPath())
+					.jreDirectoryName(extension.getJreDirectoryName())
+					.jreMinVersion(extension.getJreMinVersion())
+					.jrePath(extension.getJrePath())
+					.licenseFile(extension.getLicenseFile())
+					.linuxConfig(extension.getLinuxConfig())
+					.macConfig(extension.getMacConfig())
+					.mainClass(extension.getMainClass())
+					.manifest(extension.getManifest())
+					.modules(extension.getModules())
+					.name(extension.getName())
+					.organizationEmail(extension.getOrganizationEmail())
+					.organizationName(extension.getOrganizationName())
+					.organizationUrl(extension.getOrganizationUrl())
+					.outputDirectory(extension.getOutputDirectory())
+					.packagingJdk(extension.getPackagingJdk())
+					.runnableJar(extension.getRunnableJar())
+					.useResourcesAsWorkingDir(extension.isUseResourcesAsWorkingDir())
+					.url(extension.getUrl())
+					.version(defaultIfNull(extension.getVersion(), getProject().getVersion().toString()))
+					.vmArgs(extension.getVmArgs())
+					.winConfig(extension.getWinConfig());
 
 	}
 

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

@@ -86,13 +86,21 @@ public Launch4jLibraryTask getLibraryTask() {
 	public void setLibraryTask(Launch4jLibraryTask libraryTask) {
 		this.libraryTask = libraryTask;
 	}
-
+	
 	/**
 	 * Returns project's default toolchain
 	 * 
 	 * @return Default toolchain
 	 */
 	public File getDefaultToolchain() {
+		if (project.getGradle().getGradleVersion().compareTo("7") >= 0)
+			return getToolchain();
+		else
+			return super.getDefaultToolchain();
+	}
+
+	private File getToolchain() {
+		
 		// Default toolchain
 		JavaToolchainSpec toolchain = project.getExtensions().getByType(JavaPluginExtension.class).getToolchain();
 
@@ -104,6 +112,7 @@ public File getDefaultToolchain() {
 			return defaultLauncher.get().getMetadata().getInstallationPath().getAsFile();
 		}
 		return super.getDefaultToolchain();
+		
 	}
 
 }

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

@@ -226,18 +226,6 @@ public void setGenerateInstaller(Boolean generateInstaller) {
 		this.generateInstaller = generateInstaller;
 	}
 
-	@InputFile
-	@Optional
-	private File iconFile;
-	
-	public File getIconFile() {
-		return iconFile;
-	}
-	
-	public void setIconFile(File iconFile) {
-		this.iconFile = iconFile;
-	}
-	
 	@InputDirectory
 	@Optional
 	private File jdkPath;
@@ -590,7 +578,6 @@ protected Packager createPackager() throws Exception {
 					.extra(defaultIfNull(extra, extension.getExtra()))
 					.fileAssociations(defaultIfNull(fileAssociations, extension.getFileAssociations()))
 					.generateInstaller(defaultIfNull(generateInstaller, extension.getGenerateInstaller()))
-					.iconFile(defaultIfNull(iconFile, extension.getIconFile()))
 					.jdkPath(defaultIfNull(jdkPath, extension.getJdkPath()))
 					.jreDirectoryName(defaultIfBlank(jreDirectoryName, extension.getJreDirectoryName()))
 					.jreMinVersion(defaultIfBlank(jreMinVersion, extension.getJreMinVersion()))
@@ -606,7 +593,7 @@ protected Packager createPackager() throws Exception {
 					.organizationName(defaultIfNull(organizationName, extension.getOrganizationName()))
 					.organizationUrl(defaultIfNull(organizationUrl, extension.getOrganizationUrl()))
 					.outputDirectory(defaultIfNull(outputDirectory, extension.getOutputDirectory()))
-					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getContext().getDefaultToolchain()))
+					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
 					.runnableJar(defaultIfNull(runnableJar, extension.getRunnableJar()))
 					.scripts(defaultIfNull(scripts, extension.getScripts()))
 					.useResourcesAsWorkingDir(defaultIfNull(useResourcesAsWorkingDir, extension.isUseResourcesAsWorkingDir()))

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 = packager.packagingJdk;
+		File currentJdk = packager.getPackagingJdk();
 
 		Logger.infoIndent("Bundling JRE ... with " + currentJdk);