Bug 1967292 - Update ktlint to version 1.6.0. r=android-reviewers,mcarare

Differential Revision: https://phabricator.services.mozilla.com/D250064

gradle/libs.versions.toml

@@ -6,8 +6,6 @@ lint = "31.10.0"
 python-envs-plugin = "0.0.31"
 maven-ant-tasks = "2.1.3"
 androidsvg = "1.4"
-detekt = "1.23.8"
-ktlint = "1.5.0"
 zxing = "3.5.3"
 disklrucache = "2.0.2"
 leakcanary = "2.14"
@@ -78,6 +76,11 @@ kotlin = "2.1.21" # remember to change ksp-plugin
 ksp-plugin = "2.1.21-2.0.1"
 serialization = "1.8.1"
 
+# Linter versions
+detekt = "1.23.8"
+ktlint = "1.6.0"
+spotless = "7.0.2"
+
 # Mozilla versions
 apilint = "0.5.4"
 mozilla-glean = "64.2.0"
@@ -102,7 +105,6 @@ okio = "3.11.0"
 sentry = "8.12.0"
 
 commons-exec = "1.3"
-spotless = "7.0.2"
 tomlj = "1.1.0"
 
 [libraries]

mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/InputResultDetail.kt

@@ -13,6 +13,7 @@ import androidx.annotation.VisibleForTesting
 const val INPUT_HANDLING_UNKNOWN = -1
 
 // The below top-level values are following the same from [org.mozilla.geckoview.PanZoomController]
+
 /**
  * The content has no scrollable element.
  *

mobile/android/android-components/components/service/pocket/src/test/java/mozilla/components/service/pocket/mars/db/SponsoredContentsDaoTest.kt

@@ -173,11 +173,6 @@ class SponsoredContentsDaoTest {
         assertEquals(sponsoredContent3.url, impressions[1].url)
     }
 
-    /**
-     * Sets an executor to be used for database transactions.
-     * Needs to be used along with "runTest" to ensure waiting for transactions to finish but
-     * not hang tests.
-     */
     /**
      * Sets an executor to be used for database transactions.
      * Needs to be used along with "runTest" to ensure waiting for transactions to finish but

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt

@@ -74,8 +74,7 @@ object AppAndSystemHelper {
     suspend fun bookmarks() = bookmarksStorage.getTree(BookmarkRoot.Mobile.id)?.children
     fun getPermissionAllowID(): String {
         Log.i(TAG, "getPermissionAllowID: Trying to get the permission button resource ID based on API.")
-        return when
+        return when (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-            (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
             true -> {
                 Log.i(TAG, "getPermissionAllowID: Getting the permission button resource ID for API ${Build.VERSION.SDK_INT}.")
                 "com.android.permissioncontroller"

mobile/android/focus-android/app/src/main/java/org/mozilla/focus/cookiebannerreducer/CookieBannerReducerItem.kt

@@ -87,8 +87,7 @@ fun CookieBannerReducerItem(
             shape = RectangleShape,
         )
 
-    if (cookieBannerReducerStatus !is CookieBannerReducerStatus.CookieBannerUnsupportedSiteRequestWasSubmitted
+    if (cookieBannerReducerStatus !is CookieBannerReducerStatus.CookieBannerUnsupportedSiteRequestWasSubmitted) {
-    ) {
         rowModifier = rowModifier.then(
             Modifier.clickable(
                 interactionSource = remember { MutableInteractionSource() },

mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/PrivacySecuritySettingsFragment.kt

@@ -40,8 +40,7 @@ class PrivacySecuritySettingsFragment :
             getString(R.string.preference_security_biometric_summary2, appName)
 
         // Remove the biometric toggle if the software or hardware do not support it
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !requireContext().canUseBiometricFeature()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !requireContext().canUseBiometricFeature()) {
-        ) {
             biometricPreference?.let { preferenceScreen.removePreference(it) }
         }
         if (!FocusNimbus.features.onboarding.value().isCfrEnabled ||