Skip to content

feat: support --verbose option #95

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

Closed
jjohannes wants to merge 1 commit into from
Closed

feat: support --verbose option #95

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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: ");
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/gradlex/javamodule/packaging/test/JavaModulePackagingResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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()))
Expand All @@ -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 {
Expand Down
Loading