From 5bfb763988fdd27aaa15bbe02d0e59ea2271ec7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Wed, 12 Feb 2025 12:12:48 +0100
Subject: [PATCH] Upgrade clikt dependency, too
---
briar-desktop/build.gradle.kts | 2 +-
.../src/main/kotlin/org/briarproject/briar/desktop/Main.kt | 5 ++++-
.../briar/desktop/builddata/GenerateBuildDataSourceTask.kt | 7 +++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts
index ec3daf0d7..8b463ae70 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 a306385f4..3bcbb3c01 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 e2107c3e3..2e6540641 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")
--
GitLab