diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts index ec3daf0d7b3c15bf11ce440be7d5d06636ad7b66..8b463ae70711a4bceff87f3a0f1b4314ac25f5d1 100644 --- a/briar-desktop/build.gradle.kts +++ b/briar-desktop/build.gradle.kts @@ -129,7 +129,7 @@ dependencies { // needed to access Dispatchers.Swing for EventExecutor implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4") - implementation("com.github.ajalt.clikt:clikt:3.4.0") + implementation("com.github.ajalt.clikt:clikt:5.0.3") implementation("com.ibm.icu:icu4j:76.1") implementation("net.java.dev.jna:jna:5.16.0") diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt index a306385f40576eccceaff524faf8ac6191657dc4..3bcbb3c01560b95e0cdb4b9d9d79eacedb7719ae 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt @@ -21,6 +21,8 @@ package org.briarproject.briar.desktop import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.window.application 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.options.counted import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.flag @@ -57,13 +59,14 @@ private val DEFAULT_DATA_DIR = getProperty("user.home") + separator + ".briar" + private class Main : CliktCommand( name = "briar-desktop", // NON-NLS - help = i18n("main.help.title") ) { companion object { private val LOG = KotlinLogging.logger {} } + override fun help(context: Context): String = i18n("main.help.title") + private val version by option( "--version", // NON-NLS help = i18n("main.help.version") diff --git a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt index e2107c3e3eeead9bc5034ce53c0ad19e92aabd65..2e65406415dca4cdb3af82fcc60d7ef42de74ace 100644 --- a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt +++ b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt @@ -55,6 +55,13 @@ open class GenerateBuildDataSourceTask : AbstractBuildDataTask() { put(UnversionedArtifact("com.fasterxml.jackson.core", "jackson-core"), "Apache 2.0") put(UnversionedArtifact("com.fasterxml.jackson.core", "jackson-databind"), "Apache 2.0") put(UnversionedArtifact("com.github.ajalt.clikt", "clikt-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.clikt", "clikt-core-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.colormath", "colormath-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.mordant", "mordant-core-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.mordant", "mordant-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.mordant", "mordant-jvm-ffm-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.mordant", "mordant-jvm-graal-ffi-jvm"), "Apache 2.0") + put(UnversionedArtifact("com.github.ajalt.mordant", "mordant-jvm-jna-jvm"), "Apache 2.0") put(UnversionedArtifact("com.google.code.findbugs", "jsr305"), "Apache 2.0") put(UnversionedArtifact("com.google.dagger", "dagger"), "Apache 2.0") put(UnversionedArtifact("com.h2database", "h2"), "EPL 1.0/MPL 2.0")