From c647679e4de85e2a3cd643e1665b1d83bb4aa707 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Wed, 11 Nov 2020 15:24:42 -0800 Subject: [PATCH] No issue: move relevant :mozilla-detekt-rules to perf/ pkg. --- .github/CODEOWNERS | 1 - .../org/mozilla/fenix/detektrules/CustomRulesetProvider.kt | 3 +++ .../detektrules/{ => perf}/MozillaBannedPropertyAccess.kt | 2 +- .../fenix/detektrules/{ => perf}/MozillaRunBlockingCheck.kt | 4 +--- .../detektrules/{ => perf}/MozillaStrictModeSuppression.kt | 4 +--- .../detektrules/{ => perf}/MozillaBannedPropertyAccessTest.kt | 2 +- .../{ => perf}/MozillaStrictModeSuppressionTest.kt | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) rename mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/{ => perf}/MozillaBannedPropertyAccess.kt (97%) rename mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/{ => perf}/MozillaRunBlockingCheck.kt (93%) rename mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/{ => perf}/MozillaStrictModeSuppression.kt (97%) rename mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/{ => perf}/MozillaBannedPropertyAccessTest.kt (98%) rename mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/{ => perf}/MozillaStrictModeSuppressionTest.kt (98%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6f6711ea8..a3c059a23 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,7 +55,6 @@ *Application.kt @mozilla-mobile/Performance *StrictMode*kt @mozilla-mobile/Performance *ConstraintLayoutPerfDetector* @mozilla-mobile/Performance -*MozillaRunBlockingCheck.kt @mozilla-mobile/Performance # We want to be aware of new features behind flags as well as features # about to be enabled. diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetProvider.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetProvider.kt index e7fec788d..3e829d0f9 100644 --- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetProvider.kt +++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetProvider.kt @@ -7,6 +7,9 @@ package org.mozilla.fenix.detektrules import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.RuleSet import io.gitlab.arturbosch.detekt.api.RuleSetProvider +import org.mozilla.fenix.detektrules.perf.MozillaBannedPropertyAccess +import org.mozilla.fenix.detektrules.perf.MozillaStrictModeSuppression +import org.mozilla.fenix.detektrules.perf.MozillaRunBlockingCheck import org.mozilla.fenix.detektrules.perf.MozillaUseLazyMonitored class CustomRulesetProvider : RuleSetProvider { diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccess.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt similarity index 97% rename from mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccess.kt rename to mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt index c21eef6f1..7bb2698f4 100644 --- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccess.kt +++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.detektrules +package org.mozilla.fenix.detektrules.perf import io.gitlab.arturbosch.detekt.api.CodeSmell import io.gitlab.arturbosch.detekt.api.Config diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaRunBlockingCheck.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaRunBlockingCheck.kt similarity index 93% rename from mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaRunBlockingCheck.kt rename to mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaRunBlockingCheck.kt index 66ef64fb9..8dc945123 100644 --- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaRunBlockingCheck.kt +++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaRunBlockingCheck.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.detektrules +package org.mozilla.fenix.detektrules.perf import io.gitlab.arturbosch.detekt.api.* import org.jetbrains.kotlin.psi.* @@ -18,8 +18,6 @@ private const val VIOLATION_MSG = "Please use `org.mozilla.fenix.perf.runBlockin * A check to prevent us from working around mechanisms we implemented in * @see org.mozilla.fenix.perf.RunBlockingCounter.runBlockingIncrement to count how many runBlocking * are used. - * - * IF YOU UPDATE THIS FILE NAME, UPDATE CODE OWNERS. */ class MozillaRunBlockingCheck(config: Config) : Rule(config) { diff --git a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppression.kt b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppression.kt similarity index 97% rename from mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppression.kt rename to mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppression.kt index d2e89a335..a10d678c1 100644 --- a/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppression.kt +++ b/mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppression.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.detektrules +package org.mozilla.fenix.detektrules.perf import io.gitlab.arturbosch.detekt.api.CodeSmell import io.gitlab.arturbosch.detekt.api.Config @@ -19,8 +19,6 @@ private const val VIOLATION_MSG = "Please use `components.strictMode.resetAfter` /** * A check to prevent us from working around mechanisms we implemented to prevent suppressing StrictMode. - * - * IF YOU UPDATE THIS FILE NAME, UPDATE CODE OWNERS. */ class MozillaStrictModeSuppression(config: Config) : Rule(config) { override val issue = Issue( diff --git a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt similarity index 98% rename from mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt rename to mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt index b31c46ac7..a45e75b06 100644 --- a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaBannedPropertyAccessTest.kt +++ b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt @@ -4,7 +4,7 @@ @file:Suppress("Deprecation") -package org.mozilla.fenix.detektrules +package org.mozilla.fenix.detektrules.perf import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.YamlConfig diff --git a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppressionTest.kt b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppressionTest.kt similarity index 98% rename from mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppressionTest.kt rename to mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppressionTest.kt index ae788974f..d78f8a736 100644 --- a/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/MozillaStrictModeSuppressionTest.kt +++ b/mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppressionTest.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.detektrules +package org.mozilla.fenix.detektrules.perf import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.test.lint