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

Unverified Commit 58281359 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6277 from thundernest/upgrade_ktlint

Upgrade ktlint
parents bf2ac0b6 dfec81c8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
[*.{kt,kts}]
kotlin_imports_layout = *,^*
ij_kotlin_imports_layout = *,^*
+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ internal class BodyCleaner {
            .addAttributes("img", "usemap")
            .addAttributes(":all", "class", "style", "id", "dir")
            .addProtocols("img", "src", "http", "https", "cid", "data")

            // Allow all URI schemes in links
            .removeProtocols("a", "href", "ftp", "http", "https", "mailto")

+1 −1
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.eq
import org.mockito.ArgumentMatchers.same
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.Mockito.spy
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.Mockito.`when`
import org.mockito.kotlin.anyOrNull
import org.openintents.openpgp.OpenPgpApiManager.OpenPgpProviderState
import org.openintents.openpgp.OpenPgpError
+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ buildscript {
                'truth': '1.1.3',
                'turbine': '0.9.0',

                'ktlint': '0.40.0'
                'ktlint': '0.44.0'
        ]

        javaVersion = JavaVersion.VERSION_1_8
@@ -72,7 +72,7 @@ buildscript {
    dependencies {
        classpath 'com.android.tools.build:gradle:7.2.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
        classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
        classpath "org.jlleitschuh.gradle:ktlint-gradle:11.0.0"
    }
}

+1 −1

File changed.

Contains only whitespace changes.

Loading