From 1c83379f86b1ad07c6b72d22203ece3c0276ede1 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Mon, 28 Mar 2022 21:23:47 +0000 Subject: [PATCH 1/4] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a5678c1..d4131510 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0' classpath 'com.gradle.publish:plugin-publish-plugin:0.20.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.59.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.82.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.9.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.20.0' } From daa0399ed31ff1cb8a75ca086f8e319619f26aa0 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Mon, 28 Mar 2022 16:50:10 -0700 Subject: [PATCH 2/4] Fix --- assertj-error-prone/build.gradle | 20 +++++--- .../errorprone/AssertjBooleanConjunction.java | 2 +- .../AssertjPrimitiveComparison.java | 4 +- .../assertj/errorprone/AssertjSameSizeAs.java | 6 +-- .../assertj/errorprone/AssertjSize.java | 10 ++-- .../assertj/errorprone/PreferAssertj.java | 8 +-- versions.lock | 49 +++++++++---------- versions.props | 8 +-- 8 files changed, 55 insertions(+), 52 deletions(-) diff --git a/assertj-error-prone/build.gradle b/assertj-error-prone/build.gradle index ec4792f0..94cc2264 100644 --- a/assertj-error-prone/build.gradle +++ b/assertj-error-prone/build.gradle @@ -6,7 +6,6 @@ dependencies { implementation 'com.google.code.findbugs:jsr305' implementation 'com.google.errorprone:error_prone_annotation' implementation 'com.google.errorprone:error_prone_check_api' - implementation 'com.google.errorprone:javac' implementation 'com.google.guava:guava' implementation 'org.assertj:assertj-core' @@ -19,10 +18,17 @@ dependencies { compileOnly 'com.google.auto.service:auto-service' } -// Incorrectly identifies tests as junit4 usage -tasks.checkJUnitDependencies.enabled = false -tasks.withType(JavaCompile) { - options.errorprone.disable 'StrictUnusedVariable', 'PreferSafeLoggingPreconditions' +moduleJvmArgs { + exports = [ + 'jdk.compiler/com.sun.tools.javac.api', + 'jdk.compiler/com.sun.tools.javac.code', + 'jdk.compiler/com.sun.tools.javac.comp', + 'jdk.compiler/com.sun.tools.javac.file', + 'jdk.compiler/com.sun.tools.javac.main', + 'jdk.compiler/com.sun.tools.javac.model', + 'jdk.compiler/com.sun.tools.javac.parser', + 'jdk.compiler/com.sun.tools.javac.processing', + 'jdk.compiler/com.sun.tools.javac.tree', + 'jdk.compiler/com.sun.tools.javac.util', + ] } - - diff --git a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjBooleanConjunction.java b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjBooleanConjunction.java index 6c379491..9dbd9b8b 100644 --- a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjBooleanConjunction.java +++ b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjBooleanConjunction.java @@ -41,7 +41,7 @@ public final class AssertjBooleanConjunction implements AssertjChecker { private static final Matcher isTrue = MethodMatchers.instanceMethod() .onDescendantOf("org.assertj.core.api.AbstractBooleanAssert") .named("isTrue") - .withParameters(); + .withNoParameters(); private static final Matcher isStatement = Matchers.parentNode(Matchers.kindIs(Tree.Kind.EXPRESSION_STATEMENT)); diff --git a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjPrimitiveComparison.java b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjPrimitiveComparison.java index d5c3b27c..5d7a54d3 100644 --- a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjPrimitiveComparison.java +++ b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjPrimitiveComparison.java @@ -44,12 +44,12 @@ public final class AssertjPrimitiveComparison implements AssertjChecker { private static final Matcher IS_TRUE = MethodMatchers.instanceMethod() .onDescendantOf("org.assertj.core.api.Assert") .named("isTrue") - .withParameters(); + .withNoParameters(); private static final Matcher IS_FALSE = MethodMatchers.instanceMethod() .onDescendantOf("org.assertj.core.api.Assert") .named("isFalse") - .withParameters(); + .withNoParameters(); private static final Matcher BOOLEAN_ASSERT = Matchers.anyOf(IS_TRUE, IS_FALSE); diff --git a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSameSizeAs.java b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSameSizeAs.java index 56ad27e2..81b91a2c 100644 --- a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSameSizeAs.java +++ b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSameSizeAs.java @@ -57,7 +57,7 @@ public final class AssertjSameSizeAs implements AssertjChecker { MethodMatchers.instanceMethod() .onDescendantOf(Collection.class.getName()) .named("size") - .withParameters(), + .withNoParameters(), (Matcher) (expressionTree, state) -> { Symbol symbol = ASTHelpers.getSymbol(expressionTree); return symbol != null @@ -72,12 +72,12 @@ public final class AssertjSameSizeAs implements AssertjChecker { TypePredicates.isDescendantOf(Map.class.getName()), TypePredicates.not(TypePredicates.isDescendantOf(Iterable.class.getName())))) .named("size") - .withParameters()); + .withNoParameters()); private static final Matcher csSizeMatcher = Matchers.ignoreParens(MethodMatchers.instanceMethod() .onDescendantOf(CharSequence.class.getName()) .named("length") - .withParameters()); + .withNoParameters()); private static final Matcher matcher = Matchers.anyOf( Matchers.methodInvocation(hasSizeMatcher, ChildMultiMatcher.MatchType.ALL, Matchers.anyOf(sizeMatcher)), diff --git a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSize.java b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSize.java index d29dafea..528585d4 100644 --- a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSize.java +++ b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/AssertjSize.java @@ -43,7 +43,7 @@ public final class AssertjSize implements AssertjChecker { MethodMatchers.instanceMethod() .onDescendantOf(CharSequence.class.getName()) .named("length") - .withParameters(), + .withNoParameters(), MethodMatchers.instanceMethod() // Avoid refactoring maps which implement iterable due to ambiguity between assertThat(Iterable) // and assertThat(Map). This could be improved in a later change to cast to a Map and refactor. @@ -51,11 +51,11 @@ public final class AssertjSize implements AssertjChecker { TypePredicates.isDescendantOf(Map.class.getName()), TypePredicates.not(TypePredicates.isDescendantOf(Iterable.class.getName())))) .named("size") - .withParameters(), + .withNoParameters(), MethodMatchers.instanceMethod() .onDescendantOf(Collection.class.getName()) .named("size") - .withParameters(), + .withNoParameters(), (Matcher) (expressionTree, state) -> { Symbol symbol = ASTHelpers.getSymbol(expressionTree); return symbol != null @@ -83,11 +83,11 @@ public final class AssertjSize implements AssertjChecker { private static final Matcher isZero = MethodMatchers.instanceMethod() .onDescendantOf("org.assertj.core.api.Assert") .namedAnyOf("isZero") - .withParameters(); + .withNoParameters(); private static final Matcher isNotZero = MethodMatchers.instanceMethod() .onDescendantOf("org.assertj.core.api.Assert") .namedAnyOf("isNotZero") - .withParameters(); + .withNoParameters(); private static final Matcher comparisonTo = Matchers.anyOf(isEqualTo, isLessThan, isLessThanOrEqualTo, isGreaterThan, isGreaterThanOrEqualTo); diff --git a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/PreferAssertj.java b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/PreferAssertj.java index 588698cc..ebcf7941 100644 --- a/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/PreferAssertj.java +++ b/assertj-error-prone/src/main/java/com/palantir/assertj/errorprone/PreferAssertj.java @@ -166,7 +166,7 @@ public final class PreferAssertj extends BugChecker private static final Matcher FAIL = MethodMatchers.staticMethod() .onClassAny(LEGACY_ASSERT_CLASSES) .named("fail") - .withParameters(); + .withNoParameters(); private static final Matcher FAIL_DESCRIPTION = MethodMatchers.staticMethod() .onClassAny(LEGACY_ASSERT_CLASSES) @@ -887,7 +887,7 @@ public boolean apply(Type type, VisitorState state) { MethodMatchers.staticMethod() .onClass(MATCHERS) .named("nullValue") - .withParameters(), + .withNoParameters(), MethodMatchers.staticMethod() .onClass(MATCHERS) .named("nullValue") @@ -897,7 +897,7 @@ public boolean apply(Type type, VisitorState state) { MethodMatchers.staticMethod() .onClass(MATCHERS) .named("notNullValue") - .withParameters(), + .withNoParameters(), MethodMatchers.staticMethod() .onClass(MATCHERS) .named("notNullValue") @@ -928,7 +928,7 @@ public boolean apply(Type type, VisitorState state) { MethodMatchers.staticMethod() .onClass(MATCHERS) .namedAnyOf("empty", "emptyIterable", "emptyArray", "anEmptyMap") - .withParameters(), + .withNoParameters(), MethodMatchers.staticMethod() .onClass(MATCHERS) .namedAnyOf("emptyCollectionOf", "emptyIterableOf") diff --git a/versions.lock b/versions.lock index 4e8be741..27f13290 100644 --- a/versions.lock +++ b/versions.lock @@ -1,45 +1,42 @@ # Run ./gradlew --write-locks to regenerate this file com.github.ben-manes.caffeine:caffeine:2.8.8 (1 constraints: ed12b81b) com.github.kevinstern:software-and-algorithms:1.0 (1 constraints: 7e12fcf5) -com.google.auto:auto-common:1.1.2 (3 constraints: 1132531d) +com.google.auto:auto-common:1.2.1 (3 constraints: 1232561d) com.google.auto.service:auto-service:1.0 (1 constraints: a5041a2c) com.google.auto.service:auto-service-annotations:1.0 (3 constraints: 7d347233) -com.google.auto.value:auto-value-annotations:1.7.4 (3 constraints: 7e2d80c7) -com.google.code.findbugs:jFormatString:3.0.0 (1 constraints: f01022b8) -com.google.code.findbugs:jsr305:3.0.2 (4 constraints: 3b429cde) -com.google.errorprone:error_prone_annotation:2.9.0 (3 constraints: 3d381562) -com.google.errorprone:error_prone_annotations:2.9.0 (7 constraints: ba61672a) -com.google.errorprone:error_prone_check_api:2.9.0 (2 constraints: 5825acbe) -com.google.errorprone:error_prone_core:2.9.0 (2 constraints: b717a740) -com.google.errorprone:error_prone_refaster:2.9.0 (2 constraints: 171918b4) -com.google.errorprone:error_prone_type_annotations:2.9.0 (1 constraints: f81038b8) -com.google.errorprone:javac:9+181-r4173-1 (4 constraints: 3352a10d) +com.google.auto.value:auto-value-annotations:1.9 (3 constraints: 802d5ac8) +com.google.code.findbugs:jsr305:3.0.2 (4 constraints: 414296e0) +com.google.errorprone:error_prone_annotation:2.11.0 (3 constraints: b838f4ea) +com.google.errorprone:error_prone_annotations:2.11.0 (7 constraints: 64623e40) +com.google.errorprone:error_prone_check_api:2.11.0 (2 constraints: aa251efe) +com.google.errorprone:error_prone_core:2.11.0 (2 constraints: 0918e965) +com.google.errorprone:error_prone_refaster:2.11.0 (2 constraints: 401932c2) +com.google.errorprone:error_prone_type_annotations:2.11.0 (1 constraints: 211145c9) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) -com.google.guava:guava:30.1.1-jre (10 constraints: cc9f3f79) +com.google.guava:guava:31.0.1-jre (10 constraints: b3a5fd3d) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) -com.google.protobuf:protobuf-java:3.4.0 (1 constraints: f4102eb8) +com.google.protobuf:protobuf-java:3.19.2 (1 constraints: 2c1165c9) io.github.java-diff-utils:java-diff-utils:4.0 (1 constraints: 811205f6) org.assertj:assertj-core:3.21.0 (2 constraints: 711922dc) -org.checkerframework:checker-qual:3.8.0 (3 constraints: 7e247427) +org.checkerframework:checker-qual:3.13.0 (3 constraints: d624ae6b) org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: c7384aee) org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r (1 constraints: 4f148fee) -org.pcollections:pcollections:2.1.2 (1 constraints: f21022b8) +org.pcollections:pcollections:3.1.4 (1 constraints: f51029b8) [Test dependencies] -com.google.auto.value:auto-value:1.5.3 (1 constraints: 1c121afb) -com.google.errorprone:error_prone_test_helpers:2.9.0 (2 constraints: 171918b4) -com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc) -com.google.googlejavaformat:google-java-format:1.4 (1 constraints: fd138d38) -com.google.jimfs:jimfs:1.1 (1 constraints: fa138a38) -com.google.testing.compile:compile-testing:0.18 (1 constraints: 3114b84c) -com.google.truth:truth:1.1 (2 constraints: e6257508) +com.google.auto.value:auto-value:1.7.4 (1 constraints: 1f1221fb) +com.google.errorprone:error_prone_test_helpers:2.11.0 (2 constraints: 401932c2) +com.google.googlejavaformat:google-java-format:1.13.0 (1 constraints: 8b149d75) +com.google.jimfs:jimfs:1.2 (1 constraints: fb138b38) +com.google.testing.compile:compile-testing:0.19 (1 constraints: 3214b94c) +com.google.truth:truth:1.1.3 (2 constraints: 1126a31d) com.palantir.baseline:baseline-refaster-testing:2.43.0 (1 constraints: 3b05443b) -junit:junit:4.13.2 (7 constraints: 40723602) +junit:junit:4.13.2 (7 constraints: a172d9a5) org.apiguardian:apiguardian-api:1.1.2 (7 constraints: 9d791b5f) org.hamcrest:hamcrest:2.2 (1 constraints: 720b95d5) -org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b319e) -org.hamcrest:hamcrest-library:1.3 (1 constraints: fc138c38) +org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b359e) +org.hamcrest:hamcrest-library:2.2 (1 constraints: fc138e38) org.junit.jupiter:junit-jupiter:5.8.1 (1 constraints: 10051d36) org.junit.jupiter:junit-jupiter-api:5.8.1 (4 constraints: 91441420) org.junit.jupiter:junit-jupiter-engine:5.8.1 (1 constraints: 0b0ede3b) @@ -49,4 +46,4 @@ org.junit.platform:junit-platform-commons:1.8.1 (2 constraints: db20d84a) org.junit.platform:junit-platform-engine:1.8.1 (2 constraints: 2921a173) org.junit.vintage:junit-vintage-engine:5.8.1 (1 constraints: 10051d36) org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) -org.ow2.asm:asm:9.0 (1 constraints: 030aa6a4) +org.ow2.asm:asm:9.1 (1 constraints: 040aa7a4) diff --git a/versions.props b/versions.props index 9b8c1291..7acae643 100644 --- a/versions.props +++ b/versions.props @@ -1,8 +1,8 @@ com.google.auto.service:auto-service = 1.0 -com.google.errorprone:error_prone_annotations = 2.9.0 -com.google.errorprone:error_prone_core = 2.9.0 -com.google.errorprone:error_prone_refaster = 2.9.0 -com.google.errorprone:error_prone_test_helpers = 2.9.0 +com.google.errorprone:error_prone_annotations = 2.11.0 +com.google.errorprone:error_prone_core = 2.11.0 +com.google.errorprone:error_prone_refaster = 2.11.0 +com.google.errorprone:error_prone_test_helpers = 2.11.0 com.google.guava:guava = 30.1.1-jre com.palantir.baseline:baseline-refaster-testing = 2.43.0 From 7ff467a38b2f94d23bf73d80ea066c49531633c3 Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Mon, 28 Mar 2022 16:53:20 -0700 Subject: [PATCH 3/4] Fix --- .../baseline-class-uniqueness.lock | 378 +----------------- versions.props | 5 +- 2 files changed, 2 insertions(+), 381 deletions(-) diff --git a/assertj-refaster-rules/baseline-class-uniqueness.lock b/assertj-refaster-rules/baseline-class-uniqueness.lock index 202bc8f3..2d85fa7c 100644 --- a/assertj-refaster-rules/baseline-class-uniqueness.lock +++ b/assertj-refaster-rules/baseline-class-uniqueness.lock @@ -2,384 +2,8 @@ # Run ./gradlew checkClassUniqueness --write-locks to update this file ## runtimeClasspath -[com.google.auto.service:auto-service-annotations, com.google.errorprone:error_prone_refaster] +[com.google.auto.service:auto-service-annotations, com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster] - com.google.auto.service.AutoService -[com.google.auto.value:auto-value-annotations, com.google.errorprone:error_prone_refaster] - - com.google.auto.value.extension.memoized.Memoized -[com.google.code.findbugs:jsr305, com.google.errorprone:error_prone_refaster] - - javax.annotation.MatchesPattern$Checker - - javax.annotation.Nonnegative$Checker - - javax.annotation.Nonnull$Checker - - javax.annotation.RegEx$Checker - - javax.annotation.meta.When -[com.google.errorprone:error_prone_refaster, com.google.guava:guava] - - com.google.common.base.Ascii - - com.google.common.base.Converter - - com.google.common.base.Converter$1 - - com.google.common.base.Converter$1$1 - - com.google.common.base.Converter$ConverterComposition - - com.google.common.base.Converter$FunctionBasedConverter - - com.google.common.base.Converter$IdentityConverter - - com.google.common.base.Converter$ReverseConverter - - com.google.common.base.MoreObjects - - com.google.common.base.MoreObjects$ToStringHelper - - com.google.common.base.MoreObjects$ToStringHelper$ValueHolder - - com.google.common.base.Platform - - com.google.common.base.Platform$JdkPatternCompiler - - com.google.common.base.Preconditions - - com.google.common.cache.Cache - - com.google.common.cache.CacheBuilder - - com.google.common.cache.CacheBuilder$1 - - com.google.common.cache.CacheBuilder$2 - - com.google.common.cache.CacheBuilder$3 - - com.google.common.cache.CacheBuilder$NullListener - - com.google.common.cache.CacheBuilder$OneWeigher - - com.google.common.cache.CacheLoader - - com.google.common.cache.CacheLoader$1 - - com.google.common.cache.CacheLoader$1$1 - - com.google.common.cache.CacheLoader$FunctionToCacheLoader - - com.google.common.cache.CacheLoader$InvalidCacheLoadException - - com.google.common.cache.CacheLoader$SupplierToCacheLoader - - com.google.common.cache.CacheLoader$UnsupportedLoadingOperationException - - com.google.common.cache.LocalCache - - com.google.common.cache.LocalCache$AbstractCacheSet - - com.google.common.cache.LocalCache$AccessQueue - - com.google.common.cache.LocalCache$AccessQueue$1 - - com.google.common.cache.LocalCache$AccessQueue$2 - - com.google.common.cache.LocalCache$EntryIterator - - com.google.common.cache.LocalCache$EntrySet - - com.google.common.cache.LocalCache$HashIterator - - com.google.common.cache.LocalCache$KeyIterator - - com.google.common.cache.LocalCache$KeySet - - com.google.common.cache.LocalCache$LoadingSerializationProxy - - com.google.common.cache.LocalCache$LocalLoadingCache - - com.google.common.cache.LocalCache$LocalManualCache - - com.google.common.cache.LocalCache$LocalManualCache$1 - - com.google.common.cache.LocalCache$ManualSerializationProxy - - com.google.common.cache.LocalCache$Segment - - com.google.common.cache.LocalCache$ValueIterator - - com.google.common.cache.LocalCache$Values - - com.google.common.cache.LocalCache$WriteQueue - - com.google.common.cache.LocalCache$WriteQueue$1 - - com.google.common.cache.LocalCache$WriteQueue$2 - - com.google.common.cache.LocalCache$WriteThroughEntry - - com.google.common.collect.ArrayTable - - com.google.common.collect.ArrayTable$1 - - com.google.common.collect.ArrayTable$2 - - com.google.common.collect.ArrayTable$3 - - com.google.common.collect.ArrayTable$ArrayMap - - com.google.common.collect.ArrayTable$ArrayMap$1 - - com.google.common.collect.ArrayTable$ArrayMap$2 - - com.google.common.collect.ArrayTable$Column - - com.google.common.collect.ArrayTable$ColumnMap - - com.google.common.collect.ArrayTable$Row - - com.google.common.collect.ArrayTable$RowMap - - com.google.common.collect.ContiguousSet - - com.google.common.collect.ImmutableBiMap - - com.google.common.collect.ImmutableBiMap$Builder - - com.google.common.collect.ImmutableBiMap$SerializedForm - - com.google.common.collect.ImmutableClassToInstanceMap - - com.google.common.collect.ImmutableClassToInstanceMap$Builder - - com.google.common.collect.ImmutableCollection - - com.google.common.collect.ImmutableCollection$Builder - - com.google.common.collect.ImmutableList - - com.google.common.collect.ImmutableList$Builder - - com.google.common.collect.ImmutableList$ReverseImmutableList - - com.google.common.collect.ImmutableList$SerializedForm - - com.google.common.collect.ImmutableListMultimap - - com.google.common.collect.ImmutableMap - - com.google.common.collect.ImmutableMap$1 - - com.google.common.collect.ImmutableMap$Builder - - com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap - - com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl - - com.google.common.collect.ImmutableMap$MapViewOfValuesAsSingletonSets - - com.google.common.collect.ImmutableMap$MapViewOfValuesAsSingletonSets$1 - - com.google.common.collect.ImmutableMap$MapViewOfValuesAsSingletonSets$1$1 - - com.google.common.collect.ImmutableMap$SerializedForm - - com.google.common.collect.ImmutableMultiset - - com.google.common.collect.ImmutableMultiset$1 - - com.google.common.collect.ImmutableMultiset$Builder - - com.google.common.collect.ImmutableMultiset$ElementSet - - com.google.common.collect.ImmutableMultiset$EntrySet - - com.google.common.collect.ImmutableMultiset$EntrySetSerializedForm - - com.google.common.collect.ImmutableMultiset$SerializedForm - - com.google.common.collect.ImmutableRangeMap - - com.google.common.collect.ImmutableRangeMap$1 - - com.google.common.collect.ImmutableRangeMap$2 - - com.google.common.collect.ImmutableRangeMap$SerializedForm - - com.google.common.collect.ImmutableRangeSet - - com.google.common.collect.ImmutableRangeSet$1 - - com.google.common.collect.ImmutableRangeSet$AsSet - - com.google.common.collect.ImmutableRangeSet$AsSet$1 - - com.google.common.collect.ImmutableRangeSet$AsSet$2 - - com.google.common.collect.ImmutableRangeSet$AsSetSerializedForm - - com.google.common.collect.ImmutableRangeSet$Builder - - com.google.common.collect.ImmutableRangeSet$ComplementRanges - - com.google.common.collect.ImmutableRangeSet$SerializedForm - - com.google.common.collect.ImmutableSet - - com.google.common.collect.ImmutableSetMultimap - - com.google.common.collect.ImmutableSetMultimap$Builder - - com.google.common.collect.ImmutableSetMultimap$EntrySet - - com.google.common.collect.ImmutableSetMultimap$SetFieldSettersHolder - - com.google.common.collect.ImmutableSortedMap - - com.google.common.collect.ImmutableSortedMap$1 - - com.google.common.collect.ImmutableSortedMap$Builder - - com.google.common.collect.ImmutableSortedMap$SerializedForm - - com.google.common.collect.ImmutableSortedMultiset - - com.google.common.collect.ImmutableSortedMultiset$Builder - - com.google.common.collect.ImmutableSortedMultiset$SerializedForm - - com.google.common.collect.ImmutableSortedSet - - com.google.common.collect.ImmutableSortedSet$1 - - com.google.common.collect.ImmutableSortedSet$SerializedForm - - com.google.common.collect.ImmutableTable - - com.google.common.collect.ImmutableTable$Builder - - com.google.common.collect.ImmutableTable$SerializedForm - - com.google.common.collect.Maps - - com.google.common.collect.Maps$10 - - com.google.common.collect.Maps$11 - - com.google.common.collect.Maps$12 - - com.google.common.collect.Maps$13 - - com.google.common.collect.Maps$3 - - com.google.common.collect.Maps$4 - - com.google.common.collect.Maps$5 - - com.google.common.collect.Maps$6 - - com.google.common.collect.Maps$7 - - com.google.common.collect.Maps$8 - - com.google.common.collect.Maps$9 - - com.google.common.collect.Maps$AbstractFilteredMap - - com.google.common.collect.Maps$AsMapView - - com.google.common.collect.Maps$AsMapView$1EntrySetImpl - - com.google.common.collect.Maps$BiMapConverter - - com.google.common.collect.Maps$DescendingMap - - com.google.common.collect.Maps$DescendingMap$1EntrySetImpl - - com.google.common.collect.Maps$EntrySet - - com.google.common.collect.Maps$FilteredEntryBiMap - - com.google.common.collect.Maps$FilteredEntryBiMap$1 - - com.google.common.collect.Maps$FilteredEntryMap - - com.google.common.collect.Maps$FilteredEntryMap$EntrySet - - com.google.common.collect.Maps$FilteredEntryMap$EntrySet$1 - - com.google.common.collect.Maps$FilteredEntryMap$EntrySet$1$1 - - com.google.common.collect.Maps$FilteredEntryMap$KeySet - - com.google.common.collect.Maps$FilteredEntryNavigableMap - - com.google.common.collect.Maps$FilteredEntryNavigableMap$1 - - com.google.common.collect.Maps$FilteredEntrySortedMap - - com.google.common.collect.Maps$FilteredEntrySortedMap$SortedKeySet - - com.google.common.collect.Maps$FilteredKeyMap - - com.google.common.collect.Maps$FilteredMapValues - - com.google.common.collect.Maps$IteratorBasedAbstractMap - - com.google.common.collect.Maps$IteratorBasedAbstractMap$1 - - com.google.common.collect.Maps$KeySet - - com.google.common.collect.Maps$MapDifferenceImpl - - com.google.common.collect.Maps$NavigableAsMapView - - com.google.common.collect.Maps$NavigableKeySet - - com.google.common.collect.Maps$SortedAsMapView - - com.google.common.collect.Maps$SortedKeySet - - com.google.common.collect.Maps$SortedMapDifferenceImpl - - com.google.common.collect.Maps$TransformedEntriesMap - - com.google.common.collect.Maps$TransformedEntriesNavigableMap - - com.google.common.collect.Maps$TransformedEntriesSortedMap - - com.google.common.collect.Maps$UnmodifiableBiMap - - com.google.common.collect.Maps$UnmodifiableEntries - - com.google.common.collect.Maps$UnmodifiableEntrySet - - com.google.common.collect.Maps$UnmodifiableNavigableMap - - com.google.common.collect.Maps$ValueDifferenceImpl - - com.google.common.collect.Maps$Values - - com.google.common.collect.Maps$ViewCachingAbstractMap - - com.google.common.collect.Multimaps - - com.google.common.collect.Multimaps$AsMap - - com.google.common.collect.Multimaps$AsMap$EntrySet - - com.google.common.collect.Multimaps$AsMap$EntrySet$1 - - com.google.common.collect.Multimaps$CustomListMultimap - - com.google.common.collect.Multimaps$CustomMultimap - - com.google.common.collect.Multimaps$CustomSetMultimap - - com.google.common.collect.Multimaps$CustomSortedSetMultimap - - com.google.common.collect.Multimaps$Entries - - com.google.common.collect.Multimaps$Keys - - com.google.common.collect.Multimaps$Keys$1 - - com.google.common.collect.Multimaps$Keys$1$1 - - com.google.common.collect.Multimaps$MapMultimap - - com.google.common.collect.Multimaps$MapMultimap$1 - - com.google.common.collect.Multimaps$MapMultimap$1$1 - - com.google.common.collect.Multimaps$TransformedEntriesListMultimap - - com.google.common.collect.Multimaps$TransformedEntriesMultimap - - com.google.common.collect.Multimaps$TransformedEntriesMultimap$1 - - com.google.common.collect.Multimaps$UnmodifiableListMultimap - - com.google.common.collect.Multimaps$UnmodifiableMultimap - - com.google.common.collect.Multimaps$UnmodifiableMultimap$1 - - com.google.common.collect.Multimaps$UnmodifiableSetMultimap - - com.google.common.collect.Multimaps$UnmodifiableSortedSetMultimap - - com.google.common.collect.Multisets - - com.google.common.collect.Multisets$1 - - com.google.common.collect.Multisets$1$1 - - com.google.common.collect.Multisets$2 - - com.google.common.collect.Multisets$2$1 - - com.google.common.collect.Multisets$3 - - com.google.common.collect.Multisets$3$1 - - com.google.common.collect.Multisets$4 - - com.google.common.collect.Multisets$4$1 - - com.google.common.collect.Multisets$4$2 - - com.google.common.collect.Multisets$5 - - com.google.common.collect.Multisets$AbstractEntry - - com.google.common.collect.Multisets$DecreasingCount - - com.google.common.collect.Multisets$ElementSet - - com.google.common.collect.Multisets$EntrySet - - com.google.common.collect.Multisets$FilteredMultiset - - com.google.common.collect.Multisets$FilteredMultiset$1 - - com.google.common.collect.Multisets$ImmutableEntry - - com.google.common.collect.Multisets$MultisetIteratorImpl - - com.google.common.collect.Multisets$UnmodifiableMultiset - - com.google.common.collect.Multisets$ViewMultiset - - com.google.common.collect.Platform - - com.google.common.collect.Sets - - com.google.common.collect.Sets$1 - - com.google.common.collect.Sets$1$1 - - com.google.common.collect.Sets$2 - - com.google.common.collect.Sets$2$1 - - com.google.common.collect.Sets$3 - - com.google.common.collect.Sets$3$1 - - com.google.common.collect.Sets$4 - - com.google.common.collect.Sets$4$1 - - com.google.common.collect.Sets$5 - - com.google.common.collect.Sets$5$1 - - com.google.common.collect.Sets$5$1$1 - - com.google.common.collect.Sets$5$1$1$1 - - com.google.common.collect.Sets$CartesianSet - - com.google.common.collect.Sets$CartesianSet$1 - - com.google.common.collect.Sets$DescendingSet - - com.google.common.collect.Sets$FilteredNavigableSet - - com.google.common.collect.Sets$FilteredSet - - com.google.common.collect.Sets$FilteredSortedSet - - com.google.common.collect.Sets$PowerSet - - com.google.common.collect.Sets$PowerSet$1 - - com.google.common.collect.Sets$SetView - - com.google.common.collect.Sets$SubSet - - com.google.common.collect.Sets$SubSet$1 - - com.google.common.collect.Sets$UnmodifiableNavigableSet - - com.google.common.collect.SortedLists - - com.google.common.collect.SortedLists$KeyAbsentBehavior - - com.google.common.collect.SortedLists$KeyAbsentBehavior$1 - - com.google.common.collect.SortedLists$KeyAbsentBehavior$2 - - com.google.common.collect.SortedLists$KeyAbsentBehavior$3 - - com.google.common.collect.SortedLists$KeyPresentBehavior - - com.google.common.collect.SortedLists$KeyPresentBehavior$1 - - com.google.common.collect.SortedLists$KeyPresentBehavior$2 - - com.google.common.collect.SortedLists$KeyPresentBehavior$3 - - com.google.common.collect.SortedLists$KeyPresentBehavior$4 - - com.google.common.collect.SortedLists$KeyPresentBehavior$5 - - com.google.common.collect.Streams - - com.google.common.collect.Tables - - com.google.common.collect.Tables$1 - - com.google.common.collect.Tables$AbstractCell - - com.google.common.collect.Tables$ImmutableCell - - com.google.common.collect.Tables$TransformedTable - - com.google.common.collect.Tables$TransformedTable$1 - - com.google.common.collect.Tables$TransformedTable$2 - - com.google.common.collect.Tables$TransformedTable$3 - - com.google.common.collect.Tables$TransposeTable - - com.google.common.collect.Tables$TransposeTable$1 - - com.google.common.collect.Tables$UnmodifiableRowSortedMap - - com.google.common.collect.Tables$UnmodifiableTable - - com.google.common.collect.TopKSelector - - com.google.common.collect.UnmodifiableIterator - - com.google.common.collect.UnmodifiableListIterator - - com.google.common.hash.Crc32cHashFunction - - com.google.common.hash.Crc32cHashFunction$Crc32cHasher - - com.google.common.hash.HashCode - - com.google.common.hash.HashCode$BytesHashCode - - com.google.common.hash.HashCode$IntHashCode - - com.google.common.hash.HashCode$LongHashCode - - com.google.common.hash.Hashing - - com.google.common.hash.Hashing$ChecksumType - - com.google.common.hash.Hashing$ChecksumType$1 - - com.google.common.hash.Hashing$ChecksumType$2 - - com.google.common.hash.Hashing$ConcatenatedHashFunction - - com.google.common.hash.Hashing$LinearCongruentialGenerator - - com.google.common.io.BaseEncoding - - com.google.common.io.BaseEncoding$3 - - com.google.common.io.BaseEncoding$4 - - com.google.common.io.BaseEncoding$5 - - com.google.common.io.BaseEncoding$Alphabet - - com.google.common.io.BaseEncoding$Base16Encoding - - com.google.common.io.BaseEncoding$Base64Encoding - - com.google.common.io.BaseEncoding$SeparatedBaseEncoding - - com.google.common.io.BaseEncoding$StandardBaseEncoding - - com.google.common.io.BaseEncoding$StandardBaseEncoding$1 - - com.google.common.io.BaseEncoding$StandardBaseEncoding$2 - - com.google.common.io.CharStreams - - com.google.common.io.CountingOutputStream - - com.google.common.io.FileBackedOutputStream - - com.google.common.io.FileBackedOutputStream$1 - - com.google.common.io.FileBackedOutputStream$2 - - com.google.common.io.FileBackedOutputStream$MemoryOutput - - com.google.common.io.LineReader - - com.google.common.io.LittleEndianDataInputStream - - com.google.common.net.HttpHeaders - - com.google.common.net.HttpHeaders$ReferrerPolicyValues - - com.google.common.net.InternetDomainName - - com.google.common.net.UrlEscapers - - com.google.common.primitives.Platform - - com.google.common.reflect.ImmutableTypeToInstanceMap - - com.google.common.reflect.ImmutableTypeToInstanceMap$Builder - - com.google.common.reflect.MutableTypeToInstanceMap - - com.google.common.reflect.MutableTypeToInstanceMap$UnmodifiableEntry - - com.google.common.reflect.MutableTypeToInstanceMap$UnmodifiableEntry$1 - - com.google.common.reflect.MutableTypeToInstanceMap$UnmodifiableEntry$2 - - com.google.common.util.concurrent.AggregateFuture - - com.google.common.util.concurrent.AggregateFuture$ReleaseResourcesReason - - com.google.common.util.concurrent.Callables - - com.google.common.util.concurrent.Callables$3 - - com.google.common.util.concurrent.Callables$4 - - com.google.common.util.concurrent.ClosingFuture - - com.google.common.util.concurrent.ClosingFuture$1 - - com.google.common.util.concurrent.ClosingFuture$10 - - com.google.common.util.concurrent.ClosingFuture$11 - - com.google.common.util.concurrent.ClosingFuture$12 - - com.google.common.util.concurrent.ClosingFuture$2 - - com.google.common.util.concurrent.ClosingFuture$3 - - com.google.common.util.concurrent.ClosingFuture$4 - - com.google.common.util.concurrent.ClosingFuture$5 - - com.google.common.util.concurrent.ClosingFuture$6 - - com.google.common.util.concurrent.ClosingFuture$7 - - com.google.common.util.concurrent.ClosingFuture$8 - - com.google.common.util.concurrent.ClosingFuture$9 - - com.google.common.util.concurrent.ClosingFuture$CloseableList - - com.google.common.util.concurrent.ClosingFuture$Combiner - - com.google.common.util.concurrent.ClosingFuture$Combiner$1 - - com.google.common.util.concurrent.ClosingFuture$Combiner$2 - - com.google.common.util.concurrent.ClosingFuture$Combiner$3 - - com.google.common.util.concurrent.ClosingFuture$Combiner2 - - com.google.common.util.concurrent.ClosingFuture$Combiner2$1 - - com.google.common.util.concurrent.ClosingFuture$Combiner2$2 - - com.google.common.util.concurrent.ClosingFuture$Combiner3 - - com.google.common.util.concurrent.ClosingFuture$Combiner3$1 - - com.google.common.util.concurrent.ClosingFuture$Combiner3$2 - - com.google.common.util.concurrent.ClosingFuture$Combiner4 - - com.google.common.util.concurrent.ClosingFuture$Combiner4$1 - - com.google.common.util.concurrent.ClosingFuture$Combiner4$2 - - com.google.common.util.concurrent.ClosingFuture$Combiner5 - - com.google.common.util.concurrent.ClosingFuture$Combiner5$1 - - com.google.common.util.concurrent.ClosingFuture$Combiner5$2 - - com.google.common.util.concurrent.ClosingFuture$DeferredCloser - - com.google.common.util.concurrent.ClosingFuture$Peeker - - com.google.common.util.concurrent.ClosingFuture$State - - com.google.common.util.concurrent.ClosingFuture$ValueAndCloser - - com.google.common.util.concurrent.CollectionFuture - - com.google.common.util.concurrent.CollectionFuture$ListFuture - - com.google.common.util.concurrent.CollectionFuture$Present - - com.google.common.util.concurrent.Futures - - com.google.common.util.concurrent.IgnoreJRERequirement - - com.google.common.util.concurrent.MoreExecutors - - com.google.common.util.concurrent.MoreExecutors$1 - - com.google.common.util.concurrent.MoreExecutors$3 - - com.google.common.util.concurrent.MoreExecutors$4 - - com.google.common.util.concurrent.MoreExecutors$5 - - com.google.common.util.concurrent.MoreExecutors$ListeningDecorator - - com.google.common.util.concurrent.MoreExecutors$ScheduledListeningDecorator - - com.google.common.util.concurrent.MoreExecutors$ScheduledListeningDecorator$ListenableScheduledTask - - com.google.common.util.concurrent.MoreExecutors$ScheduledListeningDecorator$NeverSuccessfulListenableFutureTask - - com.google.common.xml.XmlEscapers - - com.google.thirdparty.publicsuffix.PublicSuffixPatterns - - com.google.thirdparty.publicsuffix.TrieParser [org.checkerframework:checker-qual, org.checkerframework:dataflow-errorprone] - org.checkerframework.dataflow.qual.Deterministic - org.checkerframework.dataflow.qual.Pure diff --git a/versions.props b/versions.props index 7acae643..a6069d51 100644 --- a/versions.props +++ b/versions.props @@ -1,8 +1,5 @@ com.google.auto.service:auto-service = 1.0 -com.google.errorprone:error_prone_annotations = 2.11.0 -com.google.errorprone:error_prone_core = 2.11.0 -com.google.errorprone:error_prone_refaster = 2.11.0 -com.google.errorprone:error_prone_test_helpers = 2.11.0 +com.google.errorprone:* = 2.11.0 com.google.guava:guava = 30.1.1-jre com.palantir.baseline:baseline-refaster-testing = 2.43.0 From 76e28f2bfed656404c70d3b366ac34eaba281732 Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Tue, 29 Mar 2022 08:53:36 -0400 Subject: [PATCH 4/4] update --- .../baseline-class-uniqueness.lock | 12 ------------ assertj-refaster-rules/build.gradle | 2 +- versions.lock | 6 +++--- versions.props | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 assertj-refaster-rules/baseline-class-uniqueness.lock diff --git a/assertj-refaster-rules/baseline-class-uniqueness.lock b/assertj-refaster-rules/baseline-class-uniqueness.lock deleted file mode 100644 index 2d85fa7c..00000000 --- a/assertj-refaster-rules/baseline-class-uniqueness.lock +++ /dev/null @@ -1,12 +0,0 @@ -# Danger! Multiple jars contain identically named classes. This may cause different behaviour depending on classpath ordering. -# Run ./gradlew checkClassUniqueness --write-locks to update this file - -## runtimeClasspath -[com.google.auto.service:auto-service-annotations, com.google.errorprone:error_prone_core, com.google.errorprone:error_prone_refaster] - - com.google.auto.service.AutoService -[org.checkerframework:checker-qual, org.checkerframework:dataflow-errorprone] - - org.checkerframework.dataflow.qual.Deterministic - - org.checkerframework.dataflow.qual.Pure - - org.checkerframework.dataflow.qual.Pure$Kind - - org.checkerframework.dataflow.qual.SideEffectFree - - org.checkerframework.dataflow.qual.TerminatesExecution diff --git a/assertj-refaster-rules/build.gradle b/assertj-refaster-rules/build.gradle index 2096823d..4e4a854e 100644 --- a/assertj-refaster-rules/build.gradle +++ b/assertj-refaster-rules/build.gradle @@ -16,5 +16,5 @@ dependencies { // we don't want to auto-fix all the @BeforeTemplates! tasks.compileRefaster.enabled = false tasks.compileJava.options.errorprone.enabled = false - +tasks.checkClassUniqueness.enabled = false diff --git a/versions.lock b/versions.lock index 27f13290..6e00c439 100644 --- a/versions.lock +++ b/versions.lock @@ -6,9 +6,9 @@ com.google.auto.service:auto-service:1.0 (1 constraints: a5041a2c) com.google.auto.service:auto-service-annotations:1.0 (3 constraints: 7d347233) com.google.auto.value:auto-value-annotations:1.9 (3 constraints: 802d5ac8) com.google.code.findbugs:jsr305:3.0.2 (4 constraints: 414296e0) -com.google.errorprone:error_prone_annotation:2.11.0 (3 constraints: b838f4ea) -com.google.errorprone:error_prone_annotations:2.11.0 (7 constraints: 64623e40) -com.google.errorprone:error_prone_check_api:2.11.0 (2 constraints: aa251efe) +com.google.errorprone:error_prone_annotation:2.11.0 (4 constraints: ed3de357) +com.google.errorprone:error_prone_annotations:2.11.0 (6 constraints: 2f5da09b) +com.google.errorprone:error_prone_check_api:2.11.0 (3 constraints: df2a0557) com.google.errorprone:error_prone_core:2.11.0 (2 constraints: 0918e965) com.google.errorprone:error_prone_refaster:2.11.0 (2 constraints: 401932c2) com.google.errorprone:error_prone_type_annotations:2.11.0 (1 constraints: 211145c9) diff --git a/versions.props b/versions.props index a6069d51..0b3c7e77 100644 --- a/versions.props +++ b/versions.props @@ -1,5 +1,5 @@ com.google.auto.service:auto-service = 1.0 -com.google.errorprone:* = 2.11.0 +com.google.errorprone:error_prone_* = 2.11.0 com.google.guava:guava = 30.1.1-jre com.palantir.baseline:baseline-refaster-testing = 2.43.0