For #7467: Update ktlint to 0.47.0.

Replace deprecated disabled_rules with ktlint_disabled_rules. Fix existing issues.
mozilla-mobile · Sep 6, 2022 · 2000242 · 2000242
1 parent 2407357
commit 2000242
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 20 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,4 +2,4 @@
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
 
-disabled_rules = filename
+ktlint_disabled_rules = filename
diff --git a/app/src/androidTest/java/org/mozilla/focus/activity/robots/ThreeDotMainMenuRobot.kt b/app/src/androidTest/java/org/mozilla/focus/activity/robots/ThreeDotMainMenuRobot.kt
@@ -39,7 +39,9 @@ class ThreeDotMainMenuRobot {
     fun verifyRequestDesktopSiteIsEnabled(expectedState: Boolean) {
         if (expectedState) {
             assertTrue(requestDesktopSiteButton.isChecked)
-        } else assertFalse(requestDesktopSiteButton.isChecked)
+        } else {
+            assertFalse(requestDesktopSiteButton.isChecked)
+        }
     }
 
     fun verifySettingsButtonExists() = settingsMenuButton().check(matches(isDisplayed()))

diff --git a/app/src/main/java/org/mozilla/focus/activity/CustomTabActivity.kt b/app/src/main/java/org/mozilla/focus/activity/CustomTabActivity.kt
@@ -84,7 +84,9 @@ class CustomTabActivity : LocaleAwareAppCompatActivity() {
         return if (name == EngineView::class.java.name) {
             val engineView = components.engine.createView(context, attrs)
             engineView.asView()
-        } else super.onCreateView(parent, name, context, attrs)
+        } else {
+            super.onCreateView(parent, name, context, attrs)
+        }
     }
 
     companion object {

diff --git a/app/src/main/java/org/mozilla/focus/activity/InstallFirefoxActivity.kt b/app/src/main/java/org/mozilla/focus/activity/InstallFirefoxActivity.kt
@@ -66,7 +66,9 @@ class InstallFirefoxActivity : Activity() {
             return if (!resolveInfo.activityInfo.exported) {
                 // We are not allowed to launch this activity.
                 null
-            } else resolveInfo.activityInfo
+            } else {
+                resolveInfo.activityInfo
+            }
         }
 
         private fun createStoreIntent(): Intent {

diff --git a/app/src/main/java/org/mozilla/focus/activity/MainActivity.kt b/app/src/main/java/org/mozilla/focus/activity/MainActivity.kt
@@ -101,7 +101,8 @@ open class MainActivity : LocaleAwareAppCompatActivity() {
         window.statusBarColor = ContextCompat.getColor(this, android.R.color.transparent)
         when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
             Configuration.UI_MODE_NIGHT_UNDEFINED, // We assume light here per Android doc's recommendation
-            Configuration.UI_MODE_NIGHT_NO, -> {
+            Configuration.UI_MODE_NIGHT_NO,
+            -> {
                 updateLightSystemBars()
             }
             Configuration.UI_MODE_NIGHT_YES -> {
@@ -321,7 +322,9 @@ open class MainActivity : LocaleAwareAppCompatActivity() {
     override fun onCreateView(parent: View?, name: String, context: Context, attrs: AttributeSet): View? {
         return if (name == EngineView::class.java.name) {
             components.engine.createView(context, attrs).asView()
-        } else super.onCreateView(parent, name, context, attrs)
+        } else {
+            super.onCreateView(parent, name, context, attrs)
+        }
     }
 
     override fun onBackPressed() {
@@ -449,7 +452,7 @@ open class MainActivity : LocaleAwareAppCompatActivity() {
 
     enum class AppOpenType(val type: String) {
         LAUNCH("Launch"),
-        RESUME("Resume")
+        RESUME("Resume"),
     }
 
     companion object {

diff --git a/app/src/main/java/org/mozilla/focus/appreview/AppReviewStep.kt b/app/src/main/java/org/mozilla/focus/appreview/AppReviewStep.kt
@@ -7,5 +7,5 @@ package org.mozilla.focus.appreview
 enum class AppReviewStep {
     Pending,
     ReviewNeeded,
-    Reviewed
+    Reviewed,
 }
diff --git a/app/src/main/java/org/mozilla/focus/engine/EngineSharedPreferencesListener.kt b/app/src/main/java/org/mozilla/focus/engine/EngineSharedPreferencesListener.kt
@@ -83,13 +83,13 @@ class EngineSharedPreferencesListener(
 
     enum class ChangeSource(val source: String) {
         SETTINGS("Settings"),
-        PANEL("Panel")
+        PANEL("Panel"),
     }
 
     enum class TrackerChanged(val tracker: String) {
         ADVERTISING("Advertising"),
         ANALYTICS("Analytics"),
         SOCIAL("Social"),
-        CONTENT("Content")
+        CONTENT("Content"),
     }
 }
diff --git a/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingStep.kt b/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingStep.kt
@@ -8,5 +8,5 @@ import org.mozilla.focus.R
 
 enum class OnboardingStep(val prefId: Int) {
     ON_BOARDING_FIRST_SCREEN(R.string.pref_key_first_screen),
-    ON_BOARDING_SECOND_SCREEN(R.string.pref_key_second_screen)
+    ON_BOARDING_SECOND_SCREEN(R.string.pref_key_second_screen),
 }
diff --git a/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchOverlay.kt b/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchOverlay.kt
@@ -40,7 +40,8 @@ fun SearchOverlay(
 
     when (state.value) {
         is State.Disabled,
-        is State.NoSuggestionsAPI, -> {
+        is State.NoSuggestionsAPI,
+        -> {
             if (query.value.isNullOrEmpty()) {
                 TopSitesOverlay(modifier = Modifier.background(focusColors.surface))
             }

diff --git a/app/src/main/java/org/mozilla/focus/settings/permissions/permissionoptions/SitePermission.kt b/app/src/main/java/org/mozilla/focus/settings/permissions/permissionoptions/SitePermission.kt
@@ -16,5 +16,5 @@ enum class SitePermission(val androidPermissionsList: Array<String>) : Parcelabl
     AUTOPLAY(emptyArray()),
     AUTOPLAY_AUDIBLE(emptyArray()),
     AUTOPLAY_INAUDIBLE(emptyArray()),
-    MEDIA_KEY_SYSTEM_ACCESS(emptyArray());
+    MEDIA_KEY_SYSTEM_ACCESS(emptyArray()),
 }
diff --git a/app/src/main/java/org/mozilla/focus/settings/privacy/PrivacySecuritySettingsFragment.kt b/app/src/main/java/org/mozilla/focus/settings/privacy/PrivacySecuritySettingsFragment.kt
@@ -151,7 +151,8 @@ class PrivacySecuritySettingsFragment :
                 )
             }
             resources.getString(R.string.pref_key_secure),
-            resources.getString(R.string.pref_key_biometric), -> {
+            resources.getString(R.string.pref_key_biometric),
+            -> {
                 // We need to recreate the activity to apply the SECURE flags.
                 requireActivity().recreate()
             }

diff --git a/app/src/main/java/org/mozilla/focus/telemetry/TelemetryWrapper.kt b/app/src/main/java/org/mozilla/focus/telemetry/TelemetryWrapper.kt
@@ -705,7 +705,7 @@ object TelemetryWrapper {
     }
 
     enum class AutoCompleteEventSource {
-        SETTINGS
+        SETTINGS,
     }
 
     fun saveAutocompleteDomainEvent(eventSource: AutoCompleteEventSource) {

diff --git a/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupPathProvider.kt b/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupPathProvider.kt
@@ -33,7 +33,7 @@ class StartupPathProvider {
          * - this API is accessed before it is set
          * - if no intent is received before the activity is STARTED (e.g. app switcher)
          */
-        NOT_SET
+        NOT_SET,
     }
 
     /**

diff --git a/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupStateProvider.kt b/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupStateProvider.kt
@@ -32,7 +32,7 @@ class StartupStateProvider(
          * - if the activity this is called from is not currently started
          * - if the currently started activity is not the first started activity
          */
-        UNKNOWN;
+        UNKNOWN,
     }
 
     /**

diff --git a/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupTypeTelemetry.kt b/app/src/main/java/org/mozilla/focus/telemetry/startuptelemetry/StartupTypeTelemetry.kt
@@ -54,7 +54,8 @@ class StartupTypeTelemetry(
 
             // To avoid combinatorial explosion in label names, we bucket NOT_SET into UNKNOWN.
             StartupPath.NOT_SET,
-            StartupPath.UNKNOWN, -> "unknown"
+            StartupPath.UNKNOWN,
+            -> "unknown"
         }
 
         return "${stateLabel}_$pathLabel"

diff --git a/app/src/main/java/org/mozilla/focus/utils/SupportUtils.kt b/app/src/main/java/org/mozilla/focus/utils/SupportUtils.kt
@@ -49,7 +49,7 @@ object SupportUtils {
         SEARCH_SUGGESTIONS("search-suggestions-focus-android"),
         ALLOWLIST("focus-android-allowlist"),
         STUDIES("how-opt-out-studies-firefox-focus-android"),
-        HTTPS_ONLY("https-only-prefs-focus")
+        HTTPS_ONLY("https-only-prefs-focus"),
     }
 
     fun getGenericSumoURLForTopic(topic: SumoTopic): String {

diff --git a/build.gradle b/build.gradle
@@ -80,7 +80,7 @@ configurations {
 }
 
 dependencies {
-    ktlint("com.pinterest:ktlint:0.46.1") {
+    ktlint("com.pinterest:ktlint:0.47.0") {
         attributes {
             attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL))
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ class StartupPathProvider { @@
              * - this API is accessed before it is set
              * - if no intent is received before the activity is STARTED (e.g. app switcher)
              */
-            NOT_SET
+            NOT_SET,
         }
         /**
@@ Expand Down @@