From 5b276d4699521ee688f234046694f91bdfff65c1 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Wed, 28 Jan 2026 11:44:47 +0100 Subject: [PATCH 1/2] feat: support --verbose option --- .github/workflows/ci-build.yml | 3 ++- build.gradle.kts | 2 -- .../org/gradlex/javamodule/packaging/tasks/Jpackage.java | 2 +- .../packaging/test/JavaModulePackagingOptionsTest.java | 8 +++++--- .../packaging/test/JavaModulePackagingResourcesTest.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4b13ef6..11e9263 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -7,10 +7,11 @@ on: branches: [ main ] jobs: - gradle-build: + ci: strategy: matrix: os: [ubuntu, macos, windows] + fail-fast: false runs-on: ${{ matrix.os }}-latest steps: - name: standardize git line endings diff --git a/build.gradle.kts b/build.gradle.kts index a0a7a2f..501ca2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,8 +15,6 @@ publishingConventions { } } -testingConventions { testGradleVersions("7.4", "7.6.5", "8.0.2", "8.14.2") } - tasks.test { inputs.property("operatingSystemName", System.getProperty("os.name")) inputs.property("operatingSystemArch", System.getProperty("os.arch")) diff --git a/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java b/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java index 2cb0d7d..9c47ff3 100644 --- a/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java +++ b/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java @@ -268,7 +268,7 @@ private void configureJPackageArguments(ExecSpec e, Directory resourcesDir) { if (!getAddModules().get().isEmpty()) { e.args("--add-modules", String.join(",", getAddModules().get())); } - if (getVerbose().get()) { + if (!getVerbose().get()) { e.args("--verbose"); } } diff --git a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java index 0ff1b5e..0ca2795 100644 --- a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java +++ b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java @@ -2,6 +2,7 @@ package org.gradlex.javamodule.packaging.test; import static org.assertj.core.api.Assertions.assertThat; +import static org.gradlex.javamodule.packaging.test.fixture.GradleBuild.runsOnLinux; import org.gradlex.javamodule.packaging.test.fixture.GradleBuild; import org.junit.jupiter.api.BeforeEach; @@ -109,13 +110,14 @@ void can_configure_add_modules() { @Test void can_set_verbose_option() { + var v = runsOnLinux() ? "true" : "false"; build.appBuildFile.appendText(""" javaModulePackaging { - verbose.set(true) + verbose.set(%s) } - """); + """.formatted(v)); - var result = build.build(":app:jpackage"); + var result = build.runner(":app:jpackage", "-q").build(); assertThat(result.getOutput()).contains("Creating app package: "); } diff --git a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java index 5ca4ad3..03a8922 100644 --- a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java +++ b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java @@ -96,7 +96,7 @@ void can_add_resources_for_jpackage() { String icon = "app.icns"; if (runsOnLinux()) icon = "app.png"; - if (runsOnWindows()) icon = "app.ico"; + if (runsOnWindows()) icon = "app.icoxxx"; // Intermediate location to collect files assertThat(build.file("app/build/tmp/jpackage/%s/jpackage-resources/dummy.txt".formatted(currentTarget())) From d2d894e0a803662daf34886c0f8cc7ad63e5190e Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Wed, 28 Jan 2026 12:32:01 +0100 Subject: [PATCH 2/2] fix: switch boolean expression --- .../javamodule/packaging/JavaModulePackagingPlugin.java | 5 ----- .../org/gradlex/javamodule/packaging/tasks/Jpackage.java | 2 +- .../packaging/test/JavaModulePackagingOptionsTest.java | 8 +++----- .../packaging/test/JavaModulePackagingResourcesTest.java | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java b/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java index 134abdf..a5a7eaa 100644 --- a/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java +++ b/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java @@ -1,13 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.gradlex.javamodule.packaging; -import javax.inject.Inject; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.file.SourceDirectorySet; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.tasks.SourceSetContainer; -import org.gradle.jvm.toolchain.JavaToolchainService; import org.gradle.util.GradleVersion; import org.gradlex.javamodule.packaging.internal.HostIdentification; import org.jspecify.annotations.NullMarked; @@ -15,9 +13,6 @@ @NullMarked public abstract class JavaModulePackagingPlugin implements Plugin { - @Inject - protected abstract JavaToolchainService getJavaToolchains(); - @Override public void apply(Project project) { if (GradleVersion.current().compareTo(GradleVersion.version("7.4")) < 0) { diff --git a/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java b/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java index 9c47ff3..2cb0d7d 100644 --- a/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java +++ b/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java @@ -268,7 +268,7 @@ private void configureJPackageArguments(ExecSpec e, Directory resourcesDir) { if (!getAddModules().get().isEmpty()) { e.args("--add-modules", String.join(",", getAddModules().get())); } - if (!getVerbose().get()) { + if (getVerbose().get()) { e.args("--verbose"); } } diff --git a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java index 0ca2795..0ff1b5e 100644 --- a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java +++ b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java @@ -2,7 +2,6 @@ package org.gradlex.javamodule.packaging.test; import static org.assertj.core.api.Assertions.assertThat; -import static org.gradlex.javamodule.packaging.test.fixture.GradleBuild.runsOnLinux; import org.gradlex.javamodule.packaging.test.fixture.GradleBuild; import org.junit.jupiter.api.BeforeEach; @@ -110,14 +109,13 @@ void can_configure_add_modules() { @Test void can_set_verbose_option() { - var v = runsOnLinux() ? "true" : "false"; build.appBuildFile.appendText(""" javaModulePackaging { - verbose.set(%s) + verbose.set(true) } - """.formatted(v)); + """); - var result = build.runner(":app:jpackage", "-q").build(); + var result = build.build(":app:jpackage"); assertThat(result.getOutput()).contains("Creating app package: "); } diff --git a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java index 03a8922..5ca4ad3 100644 --- a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java +++ b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java @@ -96,7 +96,7 @@ void can_add_resources_for_jpackage() { String icon = "app.icns"; if (runsOnLinux()) icon = "app.png"; - if (runsOnWindows()) icon = "app.icoxxx"; + if (runsOnWindows()) icon = "app.ico"; // Intermediate location to collect files assertThat(build.file("app/build/tmp/jpackage/%s/jpackage-resources/dummy.txt".formatted(currentTarget()))