From a35c1d0f72ce45bd4bd89744e6824e8e034550d1 Mon Sep 17 00:00:00 2001 From: Jacob Burroughs Date: Fri, 20 Feb 2026 21:04:20 -0600 Subject: [PATCH 1/2] Reduce uses of deprecated APIs Fixes compatibility with gradle 9 --- .../javapackager/gradle/CreateTarball.java | 4 ++-- .../javapackager/gradle/CreateZipball.java | 4 ++-- .../javapackager/gradle/GradleContext.java | 2 +- .../gradle/PackagePluginExtension.java | 2 +- .../javapackager/maven/PackageMojo.java | 4 ++-- .../javapackager/model/LinuxConfig.java | 2 +- .../fvarrui/javapackager/model/MacConfig.java | 24 +++++++++---------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/CreateTarball.java b/src/main/java/io/github/fvarrui/javapackager/gradle/CreateTarball.java index 917fac8d..737ff2be 100644 --- a/src/main/java/io/github/fvarrui/javapackager/gradle/CreateTarball.java +++ b/src/main/java/io/github/fvarrui/javapackager/gradle/CreateTarball.java @@ -69,7 +69,7 @@ else if (Platform.linux.equals(platform)) { copySpec.include(appFolder.getName() + "/" + executable.getName()); copySpec.include(appFolder.getName() + "/" + jreDirectoryName + "/bin/*"); copySpec.include(appFolder.getName() + "/scripts/*"); - copySpec.setFileMode(0755); + copySpec.filePermissions(p -> p.unix("755")); }); } @@ -93,7 +93,7 @@ else if (Platform.mac.equals(platform)) { copySpec.include(appFile.getName() + "/Contents/MacOS/universalJavaApplicationStub"); copySpec.include(appFile.getName() + "/Contents/PlugIns/" + jreDirectoryName + "/Contents/Home/bin/*"); copySpec.include(appFile.getName() + "/Contents/Resources/scripts/*"); - copySpec.setFileMode(0755); + copySpec.filePermissions(p -> p.unix("755")); }); } diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/CreateZipball.java b/src/main/java/io/github/fvarrui/javapackager/gradle/CreateZipball.java index cdd85c46..9d462bd1 100644 --- a/src/main/java/io/github/fvarrui/javapackager/gradle/CreateZipball.java +++ b/src/main/java/io/github/fvarrui/javapackager/gradle/CreateZipball.java @@ -65,7 +65,7 @@ else if (Platform.linux.equals(platform)) { copySpec.include(appFolder.getName() + "/" + executable.getName()); copySpec.include(appFolder.getName() + "/" + jreDirectoryName + "/bin/*"); copySpec.include(appFolder.getName() + "/scripts/*"); - copySpec.setFileMode(0755); + copySpec.filePermissions(p -> p.unix("755")); }); } @@ -88,7 +88,7 @@ else if (Platform.mac.equals(platform)) { copySpec.include(appFile.getName() + "/Contents/MacOS/universalJavaApplicationStub"); copySpec.include(appFile.getName() + "/Contents/PlugIns/" + jreDirectoryName + "/Contents/Home/bin/*"); copySpec.include(appFile.getName() + "/Contents/Resources/scripts/*"); - copySpec.setFileMode(0755); + copySpec.filePermissions(p -> p.unix("755")); }); } diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java b/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java index b2e1f206..4432a411 100644 --- a/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java +++ b/src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java @@ -44,7 +44,7 @@ public File getRootDir() { @Override public File getBuildDir() { - return project.getBuildDir(); + return project.getLayout().getBuildDirectory().getAsFile().get(); } @Override diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java index 105015d5..f8d9c522 100644 --- a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java +++ b/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java @@ -53,7 +53,7 @@ public PackagePluginExtension(Project project) { this.vmArgs = new ArrayList<>(); this.appArgs = new ArrayList<>(); this.winConfig = new WindowsConfig(); - this.outputDirectory = project.getBuildDir(); + this.outputDirectory = project.getLayout().getBuildDirectory().getAsFile().get(); this.scripts = new Scripts(); this.forceInstaller = false; this.arch = Arch.getDefault(); diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java index 2e8ca21a..2363c7ac 100644 --- a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java +++ b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java @@ -1,7 +1,7 @@ package io.github.fvarrui.javapackager.maven; +import static org.apache.commons.lang3.ObjectUtils.getIfNull; import static org.apache.commons.lang3.StringUtils.defaultIfBlank; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment; import java.io.File; @@ -352,7 +352,7 @@ public void execute() throws MojoExecutionException { .additionalModulePaths(additionalModulePaths) .additionalResources(additionalResources) .administratorRequired(administratorRequired) - .arch(defaultIfNull(arch, Arch.getDefault())) + .arch(getIfNull(arch, Arch.getDefault())) .assetsDir(assetsDir) .bundleJre(bundleJre) .classpath(classpath) diff --git a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java index f52507fe..d59dcdbc 100644 --- a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java +++ b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java @@ -94,7 +94,7 @@ public String toString() { */ public void setDefaults(Packager packager) { this.setCategories((categories == null || categories.isEmpty()) ? Collections.singletonList("Utility") : categories); - this.setInstallationPath(ObjectUtils.defaultIfNull(installationPath, "/opt")); + this.setInstallationPath(ObjectUtils.getIfNull(installationPath, "/opt")); } } diff --git a/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java index 2f28aec5..749c2b4f 100644 --- a/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java +++ b/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java @@ -1,6 +1,6 @@ package io.github.fvarrui.javapackager.model; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; +import static org.apache.commons.lang3.ObjectUtils.getIfNull; import java.io.File; import java.io.Serializable; @@ -305,16 +305,16 @@ public String toString() { * @param packager Packager */ public void setDefaults(Packager packager) { - this.setWindowX(defaultIfNull(this.getWindowX(), 10)); - this.setWindowY(defaultIfNull(this.getWindowY(), 60)); - this.setWindowWidth(defaultIfNull(this.getWindowWidth(), 540)); - this.setWindowHeight(defaultIfNull(this.getWindowHeight(), 360)); - this.setIconSize(defaultIfNull(this.getIconSize(), 128)); - this.setTextSize(defaultIfNull(this.getTextSize(), 16)); - this.setIconX(defaultIfNull(this.getIconX(), 52)); - this.setIconY(defaultIfNull(this.getIconY(), 116)); - this.setAppsLinkIconX(defaultIfNull(this.getAppsLinkIconX(), 360)); - this.setAppsLinkIconY(defaultIfNull(this.getAppsLinkIconY(), 116)); - this.setAppId(defaultIfNull(this.getAppId(), packager.getMainClass())); + this.setWindowX(getIfNull(this.getWindowX(), 10)); + this.setWindowY(getIfNull(this.getWindowY(), 60)); + this.setWindowWidth(getIfNull(this.getWindowWidth(), 540)); + this.setWindowHeight(getIfNull(this.getWindowHeight(), 360)); + this.setIconSize(getIfNull(this.getIconSize(), 128)); + this.setTextSize(getIfNull(this.getTextSize(), 16)); + this.setIconX(getIfNull(this.getIconX(), 52)); + this.setIconY(getIfNull(this.getIconY(), 116)); + this.setAppsLinkIconX(getIfNull(this.getAppsLinkIconX(), 360)); + this.setAppsLinkIconY(getIfNull(this.getAppsLinkIconY(), 116)); + this.setAppId(getIfNull(this.getAppId(), packager.getMainClass())); } } From ce762779b8706833756ecc6153ec9e0d31b0b738 Mon Sep 17 00:00:00 2001 From: Jacob Burroughs Date: Sun, 22 Feb 2026 12:35:26 -0600 Subject: [PATCH 2/2] Use getIfNull correctly --- .../javapackager/maven/PackageMojo.java | 6 ++--- .../javapackager/model/LinuxConfig.java | 2 +- .../fvarrui/javapackager/model/MacConfig.java | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java index 2363c7ac..18e6d354 100644 --- a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java +++ b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java @@ -352,7 +352,7 @@ public void execute() throws MojoExecutionException { .additionalModulePaths(additionalModulePaths) .additionalResources(additionalResources) .administratorRequired(administratorRequired) - .arch(getIfNull(arch, Arch.getDefault())) + .arch(getIfNull(arch, Arch::getDefault)) .assetsDir(assetsDir) .bundleJre(bundleJre) .classpath(classpath) @@ -404,11 +404,11 @@ public void execute() throws MojoExecutionException { } catch (Exception e) { throw new MojoExecutionException(e.getMessage(), e); - + } } - + } diff --git a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java index d59dcdbc..cd35090c 100644 --- a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java +++ b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java @@ -94,7 +94,7 @@ public String toString() { */ public void setDefaults(Packager packager) { this.setCategories((categories == null || categories.isEmpty()) ? Collections.singletonList("Utility") : categories); - this.setInstallationPath(ObjectUtils.getIfNull(installationPath, "/opt")); + this.setInstallationPath(ObjectUtils.getIfNull(installationPath, () -> "/opt")); } } diff --git a/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java index 749c2b4f..11f22893 100644 --- a/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java +++ b/src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java @@ -305,16 +305,16 @@ public String toString() { * @param packager Packager */ public void setDefaults(Packager packager) { - this.setWindowX(getIfNull(this.getWindowX(), 10)); - this.setWindowY(getIfNull(this.getWindowY(), 60)); - this.setWindowWidth(getIfNull(this.getWindowWidth(), 540)); - this.setWindowHeight(getIfNull(this.getWindowHeight(), 360)); - this.setIconSize(getIfNull(this.getIconSize(), 128)); - this.setTextSize(getIfNull(this.getTextSize(), 16)); - this.setIconX(getIfNull(this.getIconX(), 52)); - this.setIconY(getIfNull(this.getIconY(), 116)); - this.setAppsLinkIconX(getIfNull(this.getAppsLinkIconX(), 360)); - this.setAppsLinkIconY(getIfNull(this.getAppsLinkIconY(), 116)); - this.setAppId(getIfNull(this.getAppId(), packager.getMainClass())); + this.setWindowX(getIfNull(this.getWindowX(), () -> 10)); + this.setWindowY(getIfNull(this.getWindowY(), () -> 60)); + this.setWindowWidth(getIfNull(this.getWindowWidth(), () -> 540)); + this.setWindowHeight(getIfNull(this.getWindowHeight(), () -> 360)); + this.setIconSize(getIfNull(this.getIconSize(), () -> 128)); + this.setTextSize(getIfNull(this.getTextSize(), () -> 16)); + this.setIconX(getIfNull(this.getIconX(), () -> 52)); + this.setIconY(getIfNull(this.getIconY(), () -> 116)); + this.setAppsLinkIconX(getIfNull(this.getAppsLinkIconX(), () -> 360)); + this.setAppsLinkIconY(getIfNull(this.getAppsLinkIconY(), () -> 116)); + this.setAppId(getIfNull(this.getAppId(), packager::getMainClass)); } }