Skip to content

Commit 43967de

Browse files
committed
fix(gradle-default-package-task): Set default packagingJdk for bundle-jre
1 parent fa1ca46 commit 43967de

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package io.github.fvarrui.javapackager.gradle;
22

3-
import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;
4-
3+
import io.github.fvarrui.javapackager.packagers.Context;
54
import io.github.fvarrui.javapackager.packagers.Packager;
65
import io.github.fvarrui.javapackager.packagers.PackagerFactory;
76

7+
import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;
8+
89
/**
910
* Default packaging task for Gradle
1011
*/
@@ -51,7 +52,7 @@ protected Packager createPackager() throws Exception {
5152
.organizationName(extension.getOrganizationName())
5253
.organizationUrl(extension.getOrganizationUrl())
5354
.outputDirectory(extension.getOutputDirectory())
54-
.packagingJdk(extension.getPackagingJdk())
55+
.packagingJdk(defaultIfNull(extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
5556
.runnableJar(extension.getRunnableJar())
5657
.scripts(extension.getScripts())
5758
.useResourcesAsWorkingDir(extension.isUseResourcesAsWorkingDir())

0 commit comments

Comments
 (0)