Skip to content

Excavator: Upgrades Baseline to the latest version #1109

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
Nov 29, 2022
Merged

Excavator: Upgrades Baseline to the latest version #1109

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
7671c41
Excavator: Upgrades Baseline to the latest version
svc-excavator-bot Nov 29, 2022
a750a30
Fix LenientFormatStringValidation
Nov 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
2 changes: 1 addition & 1 deletion .baseline/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</module>
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
<property name="max" value="120"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
</module>
<module name="TreeWalker">
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
classpath 'com.palantir.gradle.jdks:gradle-jdks:0.27.0'
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.4.0'
classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.183.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjureLocalPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private void setupConjureJava(
GeneratorOptions generatorOptions = optionsSupplier.get();
Preconditions.checkArgument(
UNSAFE_JAVA_OPTIONS.stream().noneMatch(generatorOptions::has),
"Unable to generate Java bindings since unsafe options were provided",
"Unable to generate Java bindings since unsafe options were provided: %s",
generatorOptions.getProperties());

return generatorOptions;
Expand Down
2 changes: 1 addition & 1 deletion gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private void setupConjureJavaProjects(
.put(JAVA_RETROFIT_SUFFIX, (Consumer<Project>) ConjurePlugin::setupRetrofitProject)
.put(JAVA_JERSEY_SUFFIX, (Consumer<Project>) ConjurePlugin::setupJerseyProject)
.put(JAVA_UNDERTOW_SUFFIX, (Consumer<Project>) ConjurePlugin::setupUndertowProject)
.build();
.buildOrThrow();

// Make sure project names align
Sets.SetView<String> difference = Sets.difference(configs.keySet(), JAVA_PROJECT_SUFFIXES);
Expand Down
2 changes: 1 addition & 1 deletion gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static List<String> toArgs(Map<String, Object> properties, Map<String, Su
}
});

return resolvedProperties.build().entrySet().stream()
return resolvedProperties.buildOrThrow().entrySet().stream()
.sorted(Comparator.comparing(Map.Entry::getKey))
.map(entry -> {
Object value = entry.getValue();
Expand Down