Browse Source

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

master
Jeff Boek 1 year ago
parent
commit
e601fe7c9f
7 changed files with 10 additions and 6 deletions
  1. +4
    -0
      .editorconfig
  2. +1
    -1
      app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt
  3. +1
    -1
      app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt
  4. +1
    -1
      app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt
  5. +1
    -1
      app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt
  6. +1
    -1
      app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt
  7. +1
    -1
      build.gradle

+ 4
- 0
.editorconfig 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

+ 1
- 1
app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt View File

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

+ 1
- 1
app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserInteractorTest.kt View File

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

+ 1
- 1
app/src/test/java/org/mozilla/fenix/exceptions/ExceptionsInteractorTest.kt View File

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

+ 1
- 1
app/src/test/java/org/mozilla/fenix/library/history/HistoryStoreTest.kt View File

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

+ 1
- 1
app/src/test/java/org/mozilla/fenix/quickactionsheet/DefaultQuickActionSheetControllerTest.kt View File

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

+ 1
- 1
build.gradle View File

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

Loading…
Cancel
Save