Skip to content

Fix BaselineModuleJvmArgs with enable-preview functionality #2336

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

Merged
bulldozer-bot merged 2 commits into from
Jul 29, 2022
Merged

Fix BaselineModuleJvmArgs with enable-preview functionality #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553b5a0
Fix BaselineModuleJvmArgs with enable-preview functionality
iamdanfox Jul 29, 2022
467da25
Add generated changelog entries
svc-changelog Jul 29, 2022
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
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-2336.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: Fix the `BaselineModuleJvmArgs` plugin to once again work as intended
in multi-project builds
links:
- https://github.com/palantir/gradle-baseline/pull/2336
6 changes: 3 additions & 3 deletions ...le-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineModuleJvmArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.google.common.collect.ImmutableMap;
import com.palantir.baseline.extensions.BaselineModuleJvmArgsExtension;
import com.palantir.baseline.plugins.javaversions.BaselineJavaVersion;
import com.palantir.baseline.plugins.javaversions.BaselineJavaVersionsExtension;
import com.palantir.baseline.plugins.javaversions.BaselineJavaVersionExtension;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -225,8 +225,8 @@ public Iterable<String> asArguments() {

// Derive this plugin's `enablePreview` property from BaselineJavaVersion's extension
project.getPlugins().withType(BaselineJavaVersion.class, _unused -> {
BaselineJavaVersionsExtension javaVersionsExtension =
project.getExtensions().getByType(BaselineJavaVersionsExtension.class);
BaselineJavaVersionExtension javaVersionsExtension =
project.getExtensions().getByType(BaselineJavaVersionExtension.class);
Copy link
Copy Markdown
Contributor Author

@iamdanfox iamdanfox Jul 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the subtle typo here is that I was detecting that the singular BaselineJavaVersion plugin was applied, but trying to read the root level BaselineJavaVersionsExtension off this project.

This can only work in single project builds.

extension.setEnablePreview(javaVersionsExtension.runtime().map(chosenJavaVersion -> {
return chosenJavaVersion.enablePreview()
? Optional.of(chosenJavaVersion.javaLanguageVersion())
Expand Down