Skip to content

Commit 4679909

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent 70ff3eb commit 4679909

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@
468468
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
469469
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
470470
</module>
471-
<module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
472471
<module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
473472
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
474473
</module>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
1414
classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
1515
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
16-
classpath 'com.palantir.baseline:gradle-baseline-java:2.31.0'
16+
classpath 'com.palantir.baseline:gradle-baseline-java:2.38.0'
1717
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
1818
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
1919
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"

src/main/java/com/palantir/gradle/versions/ConflictSafeLockFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public LockState readLocks() {
6161
testDeps = lines.subList(testDependenciesPosition + 1, lines.size()).stream();
6262
} else {
6363
productionDeps = lines.stream().filter(line -> !line.trim().startsWith("#"));
64-
testDeps = Stream.of();
64+
testDeps = Stream.empty();
6565
}
6666

6767
return LockState.from(parseLines(productionDeps), parseLines(testDeps));

src/main/java/com/palantir/gradle/versions/VersionsLockPlugin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,9 @@ private static LockedConfigurations computeConfigurationsToLock(Project project,
881881
Collections2.transform(ext.getTestConfigurations(), project.getConfigurations()::getByName));
882882

883883
if (ext.isUseJavaPluginDefaults() && project.getPluginManager().hasPlugin("java")) {
884-
SourceSetContainer sourceSets =
885-
project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
884+
SourceSetContainer sourceSets = project.getConvention()
885+
.getPlugin(JavaPluginConvention.class)
886+
.getSourceSets();
886887

887888
lockedConfigurations.addAllProductionConfigurations(
888889
getConfigurationsForSourceSet(project, sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)));

src/main/java/com/palantir/gradle/versions/WhyDependencyTask.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ public final void taskAction() {
7070
.collect(Multimaps.toMultimap(Line::dependentsHash, Function.identity(), HashMultimap::create));
7171

7272
if (!hashOption.isPresent()) {
73-
Optional<String> example =
74-
lineByHash.keySet().stream().map(h -> ", e.g. './gradlew why --hash " + h + "'").findFirst();
73+
Optional<String> example = lineByHash.keySet().stream()
74+
.map(h -> ", e.g. './gradlew why --hash " + h + "'")
75+
.findFirst();
7576
throw new RuntimeException(
7677
"./gradlew why requires a '--hash <hash>' from versions.lock" + example.orElse(""));
7778
}

src/main/java/com/palantir/gradle/versions/lockstate/LockState.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public interface LockState extends Serializable {
4141

4242
@Value.Lazy
4343
default List<Line> allLines() {
44-
return ImmutableList.<Line>builder().addAll(productionLines()).addAll(testLines()).build();
44+
return ImmutableList.<Line>builder()
45+
.addAll(productionLines())
46+
.addAll(testLines())
47+
.build();
4548
}
4649

4750
/** Mapping from {@code group:artifact} to the full line. */

src/main/java/com/palantir/gradle/versions/lockstate/LockStates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static Line componentWithDependentsToLine(ModuleVersionIdentifier compon
7272
public static List<String> prettyPrintConstraints(Dependents dependents) {
7373
Stream<Entry<String, Collection<VersionConstraint>>> constraintEntries = Streams.concat(
7474
dependents.projectConstraints().isEmpty()
75-
? Stream.of()
75+
? Stream.empty()
7676
: Stream.of(Maps.immutableEntry("projects", dependents.projectConstraints())),
7777
dependents.nonProjectConstraints().entrySet().stream()
7878
.map(e -> Maps.immutableEntry(formatComponentIdentifier(e.getKey()), e.getValue())));

0 commit comments

Comments
 (0)