1
0
Fork 0

For #4326 - Updates codebase to support latest version of ktlint

master
Jeff Boek 2019-08-21 10:21:58 -07:00
parent d9c2c0d16a
commit e601fe7c9f
7 changed files with 10 additions and 6 deletions

4
.editorconfig 100644
View File

@ -0,0 +1,4 @@
[*.{kt,kts}]
# Disabling rules that were added in the latest versions of ktlint
# tracking here: https://github.com/mozilla-mobile/fenix/issues/4861
disabled_rules=import-ordering

View File

@ -209,4 +209,4 @@ class PerformedSearchTest {
"yandex" "yandex"
) )
) )
} }

View File

@ -262,4 +262,4 @@ class BrowserInteractorTest {
readerModeController.showControls() readerModeController.showControls()
} }
} }
} }

View File

@ -46,4 +46,4 @@ class ExceptionsInteractorTest {
interactor.onDeleteOne(exceptionsItem) interactor.onDeleteOne(exceptionsItem)
assertEquals(exceptionsItemReceived, exceptionsItem) assertEquals(exceptionsItemReceived, exceptionsItem)
} }
} }

View File

@ -60,4 +60,4 @@ class HistoryStoreTest {
items = listOf(), items = listOf(),
mode = HistoryState.Mode.Editing(setOf(historyItem, newHistoryItem)) mode = HistoryState.Mode.Editing(setOf(historyItem, newHistoryItem))
) )
} }

View File

@ -77,4 +77,4 @@ class DefaultQuickActionSheetControllerTest {
verify { metrics.track(Event.QuickActionSheetOpenInAppTapped) } verify { metrics.track(Event.QuickActionSheetOpenInAppTapped) }
verify { appLinksUseCases.appLinkRedirect.invoke(currentSession.url) } verify { appLinksUseCases.appLinkRedirect.invoke(currentSession.url) }
} }
} }

View File

@ -72,6 +72,6 @@ dependencies {
task ktlint(type: JavaExec, group: "verification") { task ktlint(type: JavaExec, group: "verification") {
description = "Check Kotlin code style." description = "Check Kotlin code style."
classpath = configurations.ktlint classpath = configurations.ktlint
main = "com.github.shyiko.ktlint.Main" main = "com.pinterest.ktlint.Main"
args "app/src/**/*.kt", "architecture/src/**/*.kt" args "app/src/**/*.kt", "architecture/src/**/*.kt"
} }