From 2d51b220d33b585ff45a9757f9080fbde9809747 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Thu, 21 Nov 2019 17:46:52 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- .baseline/checkstyle/checkstyle.xml | 1 - build.gradle | 2 +- .../com/palantir/gradle/versions/ConflictSafeLockFile.java | 2 +- .../com/palantir/gradle/versions/VersionsLockPlugin.java | 5 +++-- .../java/com/palantir/gradle/versions/WhyDependencyTask.java | 5 +++-- .../com/palantir/gradle/versions/lockstate/LockState.java | 5 ++++- .../com/palantir/gradle/versions/lockstate/LockStates.java | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 0de6d7769..5d8bc6ef7 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -468,7 +468,6 @@ - diff --git a/build.gradle b/build.gradle index 3c41c7d25..1c545c747 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1' classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4' - classpath 'com.palantir.baseline:gradle-baseline-java:2.31.0' + classpath 'com.palantir.baseline:gradle-baseline-java:2.35.2' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2' classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0' classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4" diff --git a/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java b/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java index 3f1aa3ac9..014b030e5 100644 --- a/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java +++ b/src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java @@ -61,7 +61,7 @@ public LockState readLocks() { testDeps = lines.subList(testDependenciesPosition + 1, lines.size()).stream(); } else { productionDeps = lines.stream().filter(line -> !line.trim().startsWith("#")); - testDeps = Stream.of(); + testDeps = Stream.empty(); } return LockState.from(parseLines(productionDeps), parseLines(testDeps)); diff --git a/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java b/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java index 2dc649099..1efefcf95 100644 --- a/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java +++ b/src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java @@ -881,8 +881,9 @@ private static LockedConfigurations computeConfigurationsToLock(Project project, Collections2.transform(ext.getTestConfigurations(), project.getConfigurations()::getByName)); if (ext.isUseJavaPluginDefaults() && project.getPluginManager().hasPlugin("java")) { - SourceSetContainer sourceSets = - project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets(); + SourceSetContainer sourceSets = project.getConvention() + .getPlugin(JavaPluginConvention.class) + .getSourceSets(); lockedConfigurations.addAllProductionConfigurations( getConfigurationsForSourceSet(project, sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME))); diff --git a/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java b/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java index 5390c7171..aa89c44c9 100644 --- a/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java +++ b/src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java @@ -70,8 +70,9 @@ public final void taskAction() { .collect(Multimaps.toMultimap(Line::dependentsHash, Function.identity(), HashMultimap::create)); if (!hashOption.isPresent()) { - Optional example = - lineByHash.keySet().stream().map(h -> ", e.g. './gradlew why --hash " + h + "'").findFirst(); + Optional example = lineByHash.keySet().stream() + .map(h -> ", e.g. './gradlew why --hash " + h + "'") + .findFirst(); throw new RuntimeException( "./gradlew why requires a '--hash ' from versions.lock" + example.orElse("")); } diff --git a/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java b/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java index fca68b5bf..37d166a46 100644 --- a/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java +++ b/src/main/java/com/palantir/gradle/versions/lockstate/LockState.java @@ -41,7 +41,10 @@ public interface LockState extends Serializable { @Value.Lazy default List allLines() { - return ImmutableList.builder().addAll(productionLines()).addAll(testLines()).build(); + return ImmutableList.builder() + .addAll(productionLines()) + .addAll(testLines()) + .build(); } /** Mapping from {@code group:artifact} to the full line. */ diff --git a/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java b/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java index 534db5539..9850c6b26 100644 --- a/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java +++ b/src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java @@ -72,7 +72,7 @@ private static Line componentWithDependentsToLine(ModuleVersionIdentifier compon public static List prettyPrintConstraints(Dependents dependents) { Stream>> constraintEntries = Streams.concat( dependents.projectConstraints().isEmpty() - ? Stream.of() + ? Stream.empty() : Stream.of(Maps.immutableEntry("projects", dependents.projectConstraints())), dependents.nonProjectConstraints().entrySet().stream() .map(e -> Maps.immutableEntry(formatComponentIdentifier(e.getKey()), e.getValue())));