From e473a0983449c7b888fe2bff9670c56b90fda384 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:29:40 +0200 Subject: [PATCH 1/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 8d1979601c64..cfbcf4b331c6 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -38,10 +38,10 @@ tasks.withType().configureEach { "UnnecessaryLambda", // The findings of this check are subjective because a named constant can be more readable in many cases. // picnic (https://error-prone.picnic.tech) "ConstantNaming", - "DirectReturn", // https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446 + "DirectReturn", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446 "FormatStringConcatenation", "IdentityConversion", - "LexicographicalAnnotationAttributeListing", + "LexicographicalAnnotationAttributeListing", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5043#pullrequestreview-3330615838 "LexicographicalAnnotationListing", "MissingTestCall", "NestedOptionals", From a2d7e52d5778be47d35e265439f2e5e6d758389b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:32:04 +0200 Subject: [PATCH 2/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index cfbcf4b331c6..2fe4c3628976 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -56,6 +56,10 @@ tasks.withType().configureEach { "RedundantStringConversion", "RedundantStringEscape", ) + errorproneArgs.addAll( + "-XepPatchLocation:IN_PLACE", + "-XepPatchChecks:RedundantStringConversion" + ) } else { disableAllChecks = true } From 1063171b065d9e8b4c990af68ac2a17861503b6d Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:32:19 +0200 Subject: [PATCH 3/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 2fe4c3628976..02313566a4a2 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -37,7 +37,7 @@ tasks.withType().configureEach { "StringSplitter", // We don`t want to use Guava. "UnnecessaryLambda", // The findings of this check are subjective because a named constant can be more readable in many cases. // picnic (https://error-prone.picnic.tech) - "ConstantNaming", + //"ConstantNaming", "DirectReturn", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446 "FormatStringConcatenation", "IdentityConversion", @@ -58,7 +58,7 @@ tasks.withType().configureEach { ) errorproneArgs.addAll( "-XepPatchLocation:IN_PLACE", - "-XepPatchChecks:RedundantStringConversion" + "-XepPatchChecks:ConstantNaming" ) } else { disableAllChecks = true From ba9ba498fe1874c3923c3f39c7288208b303729c Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:32:19 +0200 Subject: [PATCH 4/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 2fe4c3628976..57d08642e4f2 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -42,7 +42,6 @@ tasks.withType().configureEach { "FormatStringConcatenation", "IdentityConversion", "LexicographicalAnnotationAttributeListing", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5043#pullrequestreview-3330615838 - "LexicographicalAnnotationListing", "MissingTestCall", "NestedOptionals", "NonStaticImport", @@ -55,10 +54,11 @@ tasks.withType().configureEach { "PackageLocation", "RedundantStringConversion", "RedundantStringEscape", + //"LexicographicalAnnotationListing", ) errorproneArgs.addAll( "-XepPatchLocation:IN_PLACE", - "-XepPatchChecks:RedundantStringConversion" + "-XepPatchChecks:LexicographicalAnnotationListing" ) } else { disableAllChecks = true From acb1497fc48a17856232f8245a9106643e7a102d Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:38:10 +0200 Subject: [PATCH 5/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 57d08642e4f2..8349b87ae676 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -59,6 +59,7 @@ tasks.withType().configureEach { errorproneArgs.addAll( "-XepPatchLocation:IN_PLACE", "-XepPatchChecks:LexicographicalAnnotationListing" + // "-XepPatchChecks:ConstantNaming" why not working? ) } else { disableAllChecks = true From 0ab08e378633c5644ec32ccb664ffa9b79458e9b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Mon, 13 Oct 2025 11:38:22 +0200 Subject: [PATCH 6/6] Disable `LexicographicalAnnotationAttributeListing` --- .../kotlin/junitbuild.java-nullability-conventions.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 8349b87ae676..0d515414894f 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -37,7 +37,7 @@ tasks.withType().configureEach { "StringSplitter", // We don`t want to use Guava. "UnnecessaryLambda", // The findings of this check are subjective because a named constant can be more readable in many cases. // picnic (https://error-prone.picnic.tech) - "ConstantNaming", + // "ConstantNaming", "DirectReturn", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446 "FormatStringConcatenation", "IdentityConversion", @@ -55,6 +55,7 @@ tasks.withType().configureEach { "RedundantStringConversion", "RedundantStringEscape", //"LexicographicalAnnotationListing", + //"ConstantNaming", ) errorproneArgs.addAll( "-XepPatchLocation:IN_PLACE",