Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4c8d2f9b authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Bump Ktlint 1.2.1 -> 1.5.0

parent 5a678a08

build-plugin/src/main/kotlin/SpotlessExtension.kt

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ val kotlinEditorConfigOverride = mapOf( 
    "ktlint_code_style" to "intellij_idea",

    "ktlint_ignore_back_ticked_identifier" to "true",

    "ktlint_function_naming_ignore_when_annotated_with" to "Composable",

    "ktlint_standard_property-naming" to "disabled",

    "ktlint_standard_class-signature" to "disabled",

    "ktlint_standard_function-expression-body" to "disabled",

    "ktlint_standard_function-signature" to "disabled",

    "ktlint_standard_parameter-list-spacing" to "disabled",

    "ktlint_standard_property-naming" to "disabled",

)

build-plugin/src/main/kotlin/thunderbird.quality.spotless.gradle.kts

+2 −1
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ configure<SpotlessExtension> { 
            .setEditorConfigPath("${project.rootProject.projectDir}/.editorconfig")

            .editorConfigOverride(

                mapOf(

                    "ktlint_standard_function-signature" to "disabled",

                    "ktlint_code_style" to "intellij_idea",

                    "ktlint_standard_function-expression-body" to "disabled",

                    "ktlint_standard_function-signature" to "disabled",

                ),

            )

    }

build-plugin/src/main/kotlin/thunderbird.quality.spotless.root.gradle.kts

+2 −1
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ configure<SpotlessExtension> { 
            .setEditorConfigPath("${project.rootProject.projectDir}/.editorconfig")

            .editorConfigOverride(

                mapOf(

                    "ktlint_standard_function-signature" to "disabled",

                    "ktlint_code_style" to "intellij_idea",

                    "ktlint_standard_function-expression-body" to "disabled",

                    "ktlint_standard_function-signature" to "disabled",

                ),

            )

    }

feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModel.kt

+5 −4
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ internal class ContributionViewModel( 
    }



    private fun selectContribution(data: AvailableContributions): Contribution? {

        val hasSelectedContribution = state.value.listState.selectedContribution != null && (

        val hasSelectedContribution = state.value.listState.selectedContribution != null &&

            (

                data.oneTimeContributions.contains(state.value.listState.selectedContribution) ||

                    data.recurringContributions.contains(state.value.listState.selectedContribution)

                )

gradle/libs.versions.toml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ kotlinxCoroutines = "1.10.2" 
kotlinxCollectionsImmutable = "0.3.8"

kotlinxDateTime = "0.6.2"

kotlinxSerialization = "1.8.1"

ktlint = "1.2.1"

ktlint = "1.5.0"

ktor = "3.1.2"

kxml2 = "1.0"

landscapist = "2.4.7"