diff --git a/build.gradle b/build.gradle index 995bd796fab6..3c6eb9e4c44e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ +import org.gradle.api.services.BuildServiceParameters import org.tomlj.Toml import org.tomlj.TomlParseResult import org.tomlj.TomlTable @@ -200,7 +201,6 @@ allprojects { } } -import org.gradle.api.services.BuildServiceParameters abstract class MozconfigService implements BuildService, AutoCloseable { interface Params extends BuildServiceParameters { MapProperty getMozconfigParam() @@ -507,7 +507,6 @@ subprojects { project -> 'ktlint_standard_max-line-length' : 'disabled', 'ktlint_standard_property-naming' : 'disabled', 'ktlint_standard_statement-wrapping' : 'disabled', - 'ktlint_standard_type-parameter-list-spacing': 'disabled', ]) } } diff --git a/mobile/android/android-components/.editorconfig b/mobile/android/android-components/.editorconfig index 1a97be57bda9..6206e4092b5e 100644 --- a/mobile/android/android-components/.editorconfig +++ b/mobile/android/android-components/.editorconfig @@ -40,7 +40,6 @@ ktlint_standard_if-else-wrapping = disabled ktlint_standard_no-single-line-block-comment = disabled ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled ktlint_standard_no-wildcard-imports = disabled -ktlint_standard_parameter-list-spacing = disabled ktlint_standard_multiline-if-else = disabled # rules that enforce style we don't want diff --git a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/prompt/Choice.kt b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/prompt/Choice.kt index 185c8c9267ad..82aa8fae7536 100644 --- a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/prompt/Choice.kt +++ b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/prompt/Choice.kt @@ -22,8 +22,7 @@ data class Choice( var enable: Boolean = true, var label: String, var selected: Boolean = false, - val isASeparator: - Boolean = false, + val isASeparator: Boolean = false, val children: Array? = null, ) : Parcelable { diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt index 2de95ffec2a0..ea065ee2a537 100644 --- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt +++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt @@ -119,10 +119,12 @@ class DownloadsFeature( private val fragmentManager: FragmentManager? = null, private val promptsStyling: PromptsStyling? = null, private val shouldForwardToThirdParties: () -> Boolean = { false }, - private val customFirstPartyDownloadDialog: - ((Filename, ContentSize, PositiveActionCallback, NegativeActionCallback) -> Unit)? = null, - private val customThirdPartyDownloadDialog: - ((ThirdPartyDownloaderApps, ThirdPartyDownloaderAppChosenCallback, NegativeActionCallback) -> Unit)? = null, + private val customFirstPartyDownloadDialog: ( + (Filename, ContentSize, PositiveActionCallback, NegativeActionCallback) -> Unit + )? = null, + private val customThirdPartyDownloadDialog: ( + (ThirdPartyDownloaderApps, ThirdPartyDownloaderAppChosenCallback, NegativeActionCallback) -> Unit + )? = null, private val fileHasNotEnoughStorageDialog: ((Filename) -> Unit) = {}, ) : LifecycleAwareFeature, PermissionsFeature { diff --git a/mobile/android/fenix/.editorconfig b/mobile/android/fenix/.editorconfig index 93bf077d83d4..fb2e7159bf1a 100644 --- a/mobile/android/fenix/.editorconfig +++ b/mobile/android/fenix/.editorconfig @@ -32,7 +32,6 @@ ktlint_standard_if-else-wrapping = disabled ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled ktlint_standard_function-literal = disabled ktlint_standard_try-catch-finally-spacing = disabled -ktlint_standard_parameter-list-spacing = disabled # rules that enforce style we don't want diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt index 516ba73cdd05..2740f2b2cfc3 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/doh/info/InfoScreen.kt @@ -215,8 +215,7 @@ internal data class BulletPoint( */ internal enum class InfoScreenTopic( @StringRes val titleId: Int, - val bulletPoints: - List>, + val bulletPoints: List>, ) { DEFAULT( titleId = R.string.preference_doh_default_protection, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSwitchItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSwitchItem.kt index 272067b80865..0716cb488b37 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSwitchItem.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/translations/TranslationSwitchItem.kt @@ -61,8 +61,8 @@ sealed class TranslationPageSettingsOption( */ data class NeverTranslateSite( override val hasDivider: Boolean = true, - override val descriptionId: - Int = R.string.translation_option_bottom_sheet_switch_never_translate_site_description, + override val descriptionId: Int = + R.string.translation_option_bottom_sheet_switch_never_translate_site_description, ) : TranslationPageSettingsOption(hasDivider = hasDivider) } diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt index ce4871712e97..82cd90845fbc 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt @@ -316,7 +316,7 @@ open class BaseSessionTest( fun Any?.asJsonArray(): JSONArray = this as JSONArray @Suppress("UNCHECKED_CAST") - fun JSONObject.asMap(): Map { + fun JSONObject.asMap(): Map { val result = HashMap() for (key in this.keys()) { result[key] = this[key] as V @@ -325,7 +325,7 @@ open class BaseSessionTest( } @Suppress("UNCHECKED_CAST") - fun Any?.asJSList(): List { + fun Any?.asJSList(): List { val array = this.asJsonArray() val result = ArrayList()