From 9f5674d679e3dd7fd3aaf58e9cee76d95111ae0f Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Wed, 28 Jan 2026 11:44:47 +0100 Subject: [PATCH] feat: support --verbose option --- .github/workflows/ci-build.yml | 3 ++- .../org/gradlex/javamodule/packaging/tasks/Jpackage.java | 2 +- .../packaging/test/JavaModulePackagingOptionsTest.java | 8 +++++--- .../packaging/test/JavaModulePackagingResourcesTest.java | 4 +++- 4 files changed, 11 insertions(+), 6 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/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..27ef7bd 100644 --- a/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java +++ b/src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java @@ -9,6 +9,7 @@ import org.gradlex.javamodule.packaging.test.fixture.GradleBuild; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -96,7 +97,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())) @@ -114,6 +115,7 @@ void can_add_resources_for_jpackage() { } @Test + @Tag("no-cross-version") void can_add_resources_for_app_folder() { build.appBuildFile.appendText(""" javaModulePackaging {