From 3db135cced336dfb6fa38df41a3ffaf1a3ca7f37 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 15 Nov 2022 00:08:17 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- .baseline/checkstyle/checkstyle.xml | 2 +- build.gradle | 2 +- .../main/java/com/palantir/gradle/conjure/ConjurePlugin.java | 2 +- .../com/palantir/gradle/conjure/RenderGeneratorOptions.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 0297c79f4..fd1fa3897 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -43,7 +43,7 @@ - + diff --git a/build.gradle b/build.gradle index 07079dcc2..8d651bc36 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java index 4e50baee0..6306f7061 100644 --- a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java +++ b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/ConjurePlugin.java @@ -158,7 +158,7 @@ private void setupConjureJavaProjects( .put(JAVA_RETROFIT_SUFFIX, (Consumer) ConjurePlugin::setupRetrofitProject) .put(JAVA_JERSEY_SUFFIX, (Consumer) ConjurePlugin::setupJerseyProject) .put(JAVA_UNDERTOW_SUFFIX, (Consumer) ConjurePlugin::setupUndertowProject) - .build(); + .buildOrThrow(); // Make sure project names align Sets.SetView difference = Sets.difference(configs.keySet(), JAVA_PROJECT_SUFFIXES); diff --git a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java index b751d2475..37de21f7f 100644 --- a/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java +++ b/gradle-conjure/src/main/java/com/palantir/gradle/conjure/RenderGeneratorOptions.java @@ -57,7 +57,7 @@ public static List toArgs(Map properties, Map { Object value = entry.getValue();