Skip to content

fix(gradle-default-package-task): Set default packagingJdk for bundle-jre #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fvarrui merged 1 commit into from
Jun 6, 2023
Merged

fix(gradle-default-package-task): Set default packagingJdk for bundle-jre #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/io/github/fvarrui/javapackager/gradle/DefaultPackageTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package io.github.fvarrui.javapackager.gradle;

import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;

import io.github.fvarrui.javapackager.packagers.Context;
import io.github.fvarrui.javapackager.packagers.Packager;
import io.github.fvarrui.javapackager.packagers.PackagerFactory;

import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;

/**
* Default packaging task for Gradle
*/
Expand Down Expand Up @@ -51,7 +52,7 @@ protected Packager createPackager() throws Exception {
.organizationName(extension.getOrganizationName())
.organizationUrl(extension.getOrganizationUrl())
.outputDirectory(extension.getOutputDirectory())
.packagingJdk(extension.getPackagingJdk())
.packagingJdk(defaultIfNull(extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
.runnableJar(extension.getRunnableJar())
.scripts(extension.getScripts())
.useResourcesAsWorkingDir(extension.isUseResourcesAsWorkingDir())
Expand Down