Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update logging dependencies

This commit is contained in:
Nik Clayton 2023-11-17 11:09:44 +01:00
parent f1eaa72dd6
commit 4a6981fc07
No known key found for this signature in database
GPG Key ID: F95268159C2EC897
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build.gradle.kts
View File

@ -22,7 +22,7 @@ subprojects {
apply(plugin = "application")
dependencies {
"implementation"("com.github.ajalt.clikt:clikt:3.5.2")
"implementation"("com.github.ajalt.clikt:clikt:3.5.4")
}
tasks.withType<KotlinCompile>().configureEach {

2
tools/mklanguages/build.gradle.kts
View File

@ -27,7 +27,7 @@ dependencies {
implementation("com.github.h0tk3y.betterParse:better-parse:0.4.4")
// Logging
implementation("io.github.oshai:kotlin-logging-jvm:4.0.2")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
implementation("ch.qos.logback:logback-classic:1.4.11")
// Testing

13
tools/mklanguages/src/main/kotlin/app/pachli/mklanguages/Main.kt
View File

@ -27,7 +27,8 @@ import com.github.h0tk3y.betterParse.grammar.parseToEnd
import com.ibm.icu.text.CaseMap
import com.ibm.icu.text.Collator
import com.ibm.icu.util.ULocale
import io.github.oshai.KotlinLogging
import io.github.oshai.kotlinlogging.DelegatingKLogger
import io.github.oshai.kotlinlogging.KotlinLogging
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
@ -106,10 +107,10 @@ class App : CliktCommand(help = """Update languages in donottranslate.xml""") {
override fun run() {
System.setProperty("file.encoding", "UTF8")
(log.underlyingLogger as Logger).level = if (verbose) Level.INFO else Level.WARN
((log as? DelegatingKLogger<*>)?.underlyingLogger as Logger).level = if (verbose) Level.INFO else Level.WARN
val cwd = Paths.get("").toAbsolutePath()
log.info("working directory: $cwd")
log.info { "working directory: $cwd" }
val resourcePath = findResourcePath(cwd) ?: throw UsageError("could not find app/src/main/res in tree")
@ -125,11 +126,11 @@ class App : CliktCommand(help = """Update languages in donottranslate.xml""") {
val locales = resourceDirs
.asSequence()
.map { it.fileName.toString() }
.onEach { log.info("parsing directory name: $it") }
.onEach { log.info { "parsing directory name: $it" } }
// Special-case ber, see https://github.com/tuskyapp/Tusky/issues/3637
.map { if (it == "values-ber") "values-b+tzm+Tfng" else it }
.mapNotNull { valuesParser.parseToEnd(it).locale }
.onEach { log.info(" --> $it") }
.onEach { log.info { " --> $it" } }
.toMutableList()
.apply { add(Locale(lang = "en")) }
.map { ULocale(it.lang, it.region, it.script) }
@ -199,7 +200,7 @@ class App : CliktCommand(help = """Update languages in donottranslate.xml""") {
// Close, then replace donotranslate.xml
w.close()
Files.move(tmpFile.toPath(), donottranslate_xml, StandardCopyOption.REPLACE_EXISTING)
log.info("replaced ${donottranslate_xml.toAbsolutePath()}")
log.info { "replaced ${donottranslate_xml.toAbsolutePath()}" }
}
}