From 598f1fad2384c420d3e1f45dfeb604899a39135c Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:33 -0700 Subject: Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I8bdad4f5c2d4e9d559faaa11ccd5aa0a74d5991e --- Android.bp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Android.bp b/Android.bp index d1a7625..4bd5f51 100644 --- a/Android.bp +++ b/Android.bp @@ -72,6 +72,11 @@ java_test { "junit-params", "junit-params-assertj-core", ], + errorprone: { + javacflags: [ + "-Xep:JUnitParameterMethodNotFound:WARN", + ], + }, } //------------------------------- -- cgit v1.2.3 From b2e4b024285d6d55b14329d26bc57e7065920640 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Sat, 4 Feb 2023 16:13:57 +0000 Subject: Pin tradefed dependencies to Java 11 Bug: 267831518 Test: TH Change-Id: Ia51ae35e3d5fde29970b7880be0bcfb11f964bc9 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index 4bd5f51..dc2d598 100644 --- a/Android.bp +++ b/Android.bp @@ -41,6 +41,8 @@ java_library { srcs: ["src/main/java/**/*.java"], sdk_version: "core_current", static_libs: ["junit"], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } // compatibility host library with old name -- cgit v1.2.3