Skip to content

fix: remove duplicate runtime options #2362

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

Draft
wfouche wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

fix: remove duplicate runtime options #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ed71911
fix: remove duplicate runtime options
wfouche Dec 15, 2025
b009fd5
fix: apply Spotless updates
wfouche Dec 15, 2025
feb9a2e
fix: sort the runtime-options list
wfouche Dec 15, 2025
0405a1c
fix: revised duplicate detection code
wfouche Dec 15, 2025
315bd63
fix: apply spotless updates
wfouche Dec 15, 2025
6559e22
fix: renamed seen to duplicates
wfouche Dec 15, 2025
f65f6f4
fix: add additional comment
wfouche Dec 15, 2025
26818a7
fix: simplified scanning logic
wfouche Dec 15, 2025
e4875c7
fix: always use --add-opens= and not just --add-opens
wfouche Dec 15, 2025
5d46e0d
fix: updated testSourceTags() test
wfouche Dec 15, 2025
3e378af
fix: updated testAliasSource() test
wfouche Dec 15, 2025
fab4767
fix: streamlined implementation
wfouche Dec 15, 2025
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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ test {
def jvmArgsList = ["-javaagent:${configurations.agent.singleFile}"] // for allure reporting
if (testJavaVersion.asInt() >= 9) {
jvmArgsList.addAll([
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
"--add-opens", "java.base/java.util=ALL-UNNAMED"
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED"
])
}
jvmArgs = jvmArgsList
Expand Down
2 changes: 1 addition & 1 deletion itests/alltags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//DOCS readme.adoc

//COMPILE_OPTIONS --enable-preview --verbose
//RUNTIME_OPTIONS --add-opens java.base/java.net=ALL-UNNAMED
//RUNTIME_OPTIONS --add-opens=java.base/java.net=ALL-UNNAMED
//NATIVE_OPTIONS -O1 -d

//JAVA 11+
Expand Down
4 changes: 2 additions & 2 deletions itests/gh_fetch_release_assets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///usr/bin/env jbang "$0" "$@" ; exit $?
///RUNTIME_OPTIONS --add-opens java.base/java.net=ALL-UNNAMED
///RUNTIME_OPTIONS --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED
///RUNTIME_OPTIONS --add-opens=java.base/java.net=ALL-UNNAMED
///RUNTIME_OPTIONS --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED
//DEPS info.picocli:picocli:4.6.3
//DEPS org.kohsuke:github-api:1.116

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/dev/jbang/source/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ public Project addRepositories(@NonNull Collection<MavenRepo> repositories) {

@NonNull
public List<String> getRuntimeOptions() {
return Collections.unmodifiableList(runtimeOptions);
List<String> list = runtimeOptions.stream().distinct().collect(Collectors.toList());
return Collections.unmodifiableList(list);
}

@NonNull
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/dev/jbang/source/TestProjectBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ void testSourceTags() {
Path src = examplesTestFolder.resolve("alltags.java");
Project prj = pb.build(src);
assertThat(prj.getDescription().get(), equalTo("some description"));
assertThat(prj.getRuntimeOptions(), iterableWithSize(2));
assertThat(prj.getRuntimeOptions(), contains("--add-opens", "java.base/java.net=ALL-UNNAMED"));
assertThat(prj.getRuntimeOptions(), iterableWithSize(1));
assertThat(prj.getRuntimeOptions(), contains("--add-opens=java.base/java.net=ALL-UNNAMED"));
assertThat(prj.getMainSourceSet().getSources(), iterableWithSize(6));
assertThat(prj.getMainSourceSet().getSources(), containsInAnyOrder(
ResourceRef.forFile(src),
Expand Down Expand Up @@ -177,9 +177,9 @@ void testAliasSource() throws IOException {
ProjectBuilder pb = Project.builder();
Project prj = pb.build("alltags");
assertThat(prj.getDescription().get(), equalTo("some description"));
assertThat(prj.getRuntimeOptions(), iterableWithSize(4));
assertThat(prj.getRuntimeOptions(), iterableWithSize(3));
assertThat(prj.getRuntimeOptions(),
contains("--add-opens", "java.base/java.net=ALL-UNNAMED", "-Dfoo=bar", "-Dbar=aap noot mies"));
contains("--add-opens=java.base/java.net=ALL-UNNAMED", "-Dfoo=bar", "-Dbar=aap noot mies"));
assertThat(prj.getMainSourceSet().getSources(), iterableWithSize(7));
assertThat(prj.getMainSourceSet().getSources(), containsInAnyOrder(
new AliasResourceResolver.AliasedResourceRef(prj.getResourceRef(), null),
Expand Down