[#693] Ktlint 0.48.0
* Bump version 0.48.0 * Move config file to /tools + global suppress * Local suppress of no-semi * Minor indentation fix
This commit is contained in:
parent
00dc366fc3
commit
a8308bd492
|
@ -13,7 +13,7 @@ dependencies {
|
|||
}
|
||||
|
||||
tasks {
|
||||
val editorConfigFile = rootProject.file(".editorconfig")
|
||||
val editorConfigFile = rootProject.file("tools/.editorconfig")
|
||||
val ktlintArgs = listOf("**/src/**/*.kt", "!**/build/**.kt", "--editorconfig=$editorConfigFile")
|
||||
|
||||
register("ktlint", org.gradle.api.tasks.JavaExec::class) {
|
||||
|
|
|
@ -106,7 +106,7 @@ FLANK_VERSION=21.09.0
|
|||
FULLADLE_VERSION=0.17.4
|
||||
GRADLE_VERSIONS_PLUGIN_VERSION=0.42.0
|
||||
JGIT_VERSION=6.1.0.202203080745-r
|
||||
KTLINT_VERSION=0.47.1
|
||||
KTLINT_VERSION=0.48.0
|
||||
PLAY_PUBLISHER_PLUGIN_VERSION=3.7.0
|
||||
|
||||
ACCOMPANIST_PERMISSIONS_VERSION=0.25.1
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
# Opt-out from missing-trailing-comma rule enabled by default
|
||||
root = true
|
||||
[*.{kt,kts}]
|
||||
ktlint_standard_trailing-comma-on-call-site = disabled
|
||||
ktlint_standard_trailing-comma-on-declaration-site = disabled
|
|
@ -54,6 +54,9 @@ data class ConfigurationOverride(val uiMode: UiMode?, val locale: LocaleList?) {
|
|||
}
|
||||
}
|
||||
|
||||
// TODO [694]: Ktlint 0.48.1 (remove this suppress)
|
||||
// TODO [694]: https://github.com/zcash/secant-android-wallet/issues/694
|
||||
@Suppress("ktlint:no-semi")
|
||||
enum class UiMode {
|
||||
Light, Dark;
|
||||
}
|
||||
|
|
|
@ -128,21 +128,21 @@ fun RestoreWallet(
|
|||
Scaffold(topBar = {
|
||||
RestoreTopAppBar(onBack = onBack, onClear = { userWordList.set(emptyList()) })
|
||||
}, bottomBar = {
|
||||
Column(Modifier.verticalScroll(rememberScrollState())) {
|
||||
Warn(parseResult)
|
||||
Autocomplete(parseResult = parseResult) {
|
||||
textState = ""
|
||||
userWordList.append(listOf(it))
|
||||
focusRequester.requestFocus()
|
||||
}
|
||||
NextWordTextField(
|
||||
modifier = Modifier.focusRequester(focusRequester),
|
||||
parseResult = parseResult,
|
||||
text = textState,
|
||||
setText = { textState = it }
|
||||
)
|
||||
Column(Modifier.verticalScroll(rememberScrollState())) {
|
||||
Warn(parseResult)
|
||||
Autocomplete(parseResult = parseResult) {
|
||||
textState = ""
|
||||
userWordList.append(listOf(it))
|
||||
focusRequester.requestFocus()
|
||||
}
|
||||
}) { paddingValues ->
|
||||
NextWordTextField(
|
||||
modifier = Modifier.focusRequester(focusRequester),
|
||||
parseResult = parseResult,
|
||||
text = textState,
|
||||
setText = { textState = it }
|
||||
)
|
||||
}
|
||||
}) { paddingValues ->
|
||||
RestoreMainContent(
|
||||
paddingValues = paddingValues,
|
||||
userWordList = userWordList,
|
||||
|
|
|
@ -10,6 +10,9 @@ interface AppUpdateChecker {
|
|||
|
||||
val stalenessDays: Int
|
||||
|
||||
// TODO [694]: Ktlint 0.48.1 (remove this suppress)
|
||||
// TODO [694]: https://github.com/zcash/secant-android-wallet/issues/694
|
||||
@Suppress("ktlint:no-semi")
|
||||
enum class Priority {
|
||||
LOW {
|
||||
override fun priorityUpperBorder() = 1
|
||||
|
|
Loading…
Reference in New Issue