Bump clikt 4.4.0 -> 5.0.2

cli/autodiscovery-cli/src/main/kotlin/app/k9mail/cli/autodiscovery/AutoDiscoveryCli.kt

@@ -8,6 +8,7 @@ import app.k9mail.autodiscovery.autoconfig.createMxLookupAutoconfigDiscovery
 import app.k9mail.autodiscovery.autoconfig.createProviderAutoconfigDiscovery
 import app.k9mail.core.common.mail.toUserEmailAddress
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
@@ -17,14 +18,15 @@ import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient.Builder
 import org.koin.core.time.measureDurationForResult
 
-class AutoDiscoveryCli : CliktCommand(
-    help = "Performs the auto-discovery steps used by Thunderbird for Android to find mail server settings",
-) {
+class AutoDiscoveryCli : CliktCommand() {
     private val httpsOnly by option(help = "Only perform Autoconfig lookups using HTTPS").flag()
     private val includeEmailAddress by option(help = "Include email address in Autoconfig lookups").flag()
 
     private val emailAddress by argument(name = "email", help = "Email address")
 
+    override fun help(context: Context) =
+        "Performs the auto-discovery steps used by Thunderbird for Android to find mail server settings"
+
     override fun run() {
         echo("Attempting to find mail server settings for <$emailAddress>…")
         echo()

cli/autodiscovery-cli/src/main/kotlin/app/k9mail/cli/autodiscovery/Main.kt

@@ -1,3 +1,5 @@
 package app.k9mail.cli.autodiscovery
 
+import com.github.ajalt.clikt.core.main
+
 fun main(args: Array<String>) = AutoDiscoveryCli().main(args)

cli/html-cleaner-cli/src/main/kotlin/app/k9mail/cli/html/cleaner/Main.kt

@@ -3,6 +3,8 @@ package app.k9mail.cli.html.cleaner
 import app.k9mail.html.cleaner.HtmlHeadProvider
 import app.k9mail.html.cleaner.HtmlProcessor
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.optional
 import com.github.ajalt.clikt.parameters.types.file
@@ -13,16 +15,17 @@ import okio.sink
 import okio.source
 
 @Suppress("MemberVisibilityCanBePrivate")
-class HtmlCleaner : CliktCommand(
-    help = "A tool that modifies HTML to only keep allowed elements and attributes the same way that K-9 Mail does.",
-) {
+class HtmlCleaner : CliktCommand() {
     val input by argument(help = "HTML input file (needs to be UTF-8 encoded)")
         .inputStream()
 
     val output by argument(help = "Output file")
         .file(mustExist = false, canBeDir = false)
         .optional()
 
+    override fun help(context: Context) =
+        "A tool that modifies HTML to only keep allowed elements and attributes the same way that K-9 Mail does."
+
     override fun run() {
         val html = readInput()
         val processedHtml = cleanHtml(html)
@@ -34,9 +37,11 @@ class HtmlCleaner : CliktCommand(
     }
 
     private fun cleanHtml(html: String): String {
-        val htmlProcessor = HtmlProcessor(object : HtmlHeadProvider {
-            override val headHtml = """<meta name="viewport" content="width=device-width"/>"""
-        })
+        val htmlProcessor = HtmlProcessor(
+            object : HtmlHeadProvider {
+                override val headHtml = """<meta name="viewport" content="width=device-width"/>"""
+            },
+        )
 
         return htmlProcessor.processForDisplay(html)
     }

cli/resource-mover-cli/src/main/kotlin/net/thunderbird/cli/resource/mover/Main.kt

@@ -1,3 +1,5 @@
 package net.thunderbird.cli.resource.mover
 
+import com.github.ajalt.clikt.core.main
+
 fun main(args: Array<String>) = ResourceMoverCli().main(args)

cli/resource-mover-cli/src/main/kotlin/net/thunderbird/cli/resource/mover/ResourceMoverCli.kt

@@ -1,6 +1,7 @@
 package net.thunderbird.cli.resource.mover
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.options.split
@@ -9,7 +10,6 @@ class ResourceMoverCli(
     private val stringResourceMover: StringResourceMover = StringResourceMover(),
 ) : CliktCommand(
     name = "resource-mover",
-    help = "Move string resources from one file to another",
 ) {
     private val from: String by option(
         help = "Source module path",
@@ -23,6 +23,8 @@ class ResourceMoverCli(
         help = "Keys to move",
     ).split(",").required()
 
+    override fun help(context: Context): String = "Move string resources from one file to another"
+
     override fun run() {
         stringResourceMover.moveKeys(from, to, keys)
     }

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/Main.kt

@@ -1,3 +1,5 @@
 package net.thunderbird.cli.translation
 
+import com.github.ajalt.clikt.core.main
+
 fun main(args: Array<String>) = TranslationCli().main(args)

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/TranslationCli.kt

@@ -1,6 +1,7 @@
 package net.thunderbird.cli.translation
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
@@ -15,7 +16,6 @@ class TranslationCli(
     private val supportedLanguagesFormatter: SupportedLanguagesFormatter = SupportedLanguagesFormatter(),
 ) : CliktCommand(
     name = "translation",
-    help = "Translation CLI",
 ) {
     private val token: String by option(
         help = "Weblate API token",
@@ -29,6 +29,8 @@ class TranslationCli(
         help = "Print code example",
     ).flag()
 
+    override fun help(context: Context): String = "Translation CLI"
+
     override fun run() {
         val languageCodes = languageCodeLoader.loadCurrentAndroidLanguageCodes(token, threshold)
         val size = languageCodes.size

gradle/libs.versions.toml

@@ -47,7 +47,7 @@ appAuth = "0.11.1"
 assertk = "0.28.1"
 circleImageView = "3.1.0"
 ckchangelog = "2.0.0-beta02"
-clikt = "4.4.0"
+clikt = "5.0.2"
 commonsIo = "2.16.1"
 dependencyCheckPlugin = "0.51.0"
 dependencyGuardPlugin = "0.5.0"