Merge remote-tracking branch 'origin/main'

walt-id · Feb 18, 2025 · a89c220 · a89c220
2 parents 9ed8cbd + 89ced33
commit a89c220
Show file tree

Hide file tree

Showing 354 changed files with 1,614 additions and 2,254 deletions.
diff --git a/.run/Verifier.run.xml b/.run/Verifier.run.xml
@@ -1,14 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Verifier" type="JetRunConfigurationType">
-        <option name="ALTERNATIVE_JRE_PATH" value="17"/>
-        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
-        <option name="MAIN_CLASS_NAME" value="id.walt.verifier.MainKt"/>
-        <module name="id.walt.waltid-identity.waltid-services.waltid-verifier-api.main"/>
-        <option name="PROGRAM_PARAMETERS" value="-l trace"/>
-        <shortenClasspath name="NONE"/>
-        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/waltid-services/waltid-verifier-api"/>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
-</component>
+  <configuration default="false" name="Verifier" type="JetRunConfigurationType">
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="MAIN_CLASS_NAME" value="id.walt.verifier.MainKt" />
+    <module name="waltid-identity.waltid-services.waltid-verifier-api.main" />
+    <option name="PROGRAM_PARAMETERS" value="-l trace" />
+    <shortenClasspath name="NONE" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/waltid-services/waltid-verifier-api" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
     kotlin("plugin.serialization") version kotlinVersion apply false
 
-    id("love.forte.plugin.suspend-transform") version "2.1.0-0.10.1" apply false
+    id("love.forte.plugin.suspend-transform") version "2.1.0-0.11.0" apply false
     id("com.android.library") version "8.7.3" apply false
     id("com.android.application") version "8.7.3" apply false
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/waltid-applications/waltid-android/build.gradle.kts b/waltid-applications/waltid-android/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     kotlin("android")
     kotlin("plugin.serialization")
     kotlin("plugin.compose")
+    id("com.github.ben-manes.versions")
 }
 
 android {
@@ -57,15 +58,15 @@ dependencies {
     api(project(":waltid-libraries:sdjwt:waltid-sdjwt"))
 
     // JSON
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
 
     // -- Android --
     implementation("androidx.biometric:biometric:1.2.0-alpha05")
     implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
     implementation("androidx.navigation:navigation-compose:2.7.7")
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3")
-    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation("androidx.activity:activity-compose:1.10.1")
 
     // Compose
     implementation(platform("androidx.compose:compose-bom:2024.02.01"))
@@ -77,7 +78,7 @@ dependencies {
 
     // Testing
     testImplementation(kotlin("test"))
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
     testImplementation("junit:junit:4.13.2")
     testImplementation("androidx.test.ext:junit:1.2.1")
     testImplementation("androidx.test.espresso:espresso-core:3.6.1")

diff --git a/waltid-applications/waltid-cli/build.gradle.kts b/waltid-applications/waltid-cli/build.gradle.kts
@@ -1,15 +1,15 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 object Versions {
-    const val KTOR_VERSION = "2.3.12"
+    const val KTOR_VERSION = "3.1.0"
 }
 
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("maven-publish")
     id("com.github.ben-manes.versions")
-    id("io.ktor.plugin") version "2.3.12" // Versions.KTOR_VERSION
+    id("io.ktor.plugin") version "3.1.0" // Versions.KTOR_VERSION
     // Apply the application plugin to add support for building a CLI application in Java.
     application
 }
@@ -65,25 +65,27 @@ kotlin {
                 api(project(":waltid-libraries:sdjwt:waltid-sdjwt"))
                 api(project(":waltid-libraries:protocols:waltid-openid4vc"))
 
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
-                implementation("com.google.code.gson:gson:2.11.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
+                implementation("com.google.code.gson:gson:2.12.1")
 
                 // CLI
-                implementation("com.github.ajalt.mordant:mordant:2.7.1")
-                implementation("com.github.ajalt.clikt:clikt:4.4.0")
+                implementation("com.github.ajalt.clikt:clikt:5.0.3")
+                implementation("com.github.ajalt.clikt:clikt-markdown:5.0.3")
+                implementation("com.github.ajalt.mordant:mordant:3.0.2")
+                implementation("com.github.ajalt.mordant:mordant-markdown:3.0.2")
 
                 // Coroutines
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 
                 // Logging
-                implementation("io.github.oshai:kotlin-logging:7.0.0")
+                implementation("io.github.oshai:kotlin-logging:7.0.4")
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
             }
         }
         val jvmMain by getting {
@@ -92,18 +94,18 @@ kotlin {
                 implementation("org.slf4j:slf4j-simple:2.0.16")
 
                 // JOSE
-                implementation("com.nimbusds:nimbus-jose-jwt:9.41.1")
+                implementation("com.nimbusds:nimbus-jose-jwt:10.0.1")
 
                 // BouncyCastle for PEM import
-                implementation("org.bouncycastle:bcpkix-lts8on:2.73.6")
+                implementation("org.bouncycastle:bcpkix-lts8on:2.73.7")
             }
         }
         val jvmTest by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-                implementation("com.wolpl.clikt-testkit:clikt-testkit:2.0.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
+                implementation("com.wolpl.clikt-testkit:clikt-testkit:3.0.0")
 
-                implementation("org.junit.jupiter:junit-jupiter-params:5.11.0")
+                implementation("org.junit.jupiter:junit-jupiter-params:5.11.4")
 
                 // Ktor server
                 implementation("io.ktor:ktor-server-core-jvm:${Versions.KTOR_VERSION}")

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt
@@ -1,15 +1,16 @@
 package id.walt.cli
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 import id.walt.cli.commands.*
 import id.walt.cli.util.WaltIdCmdHelpOptionMessage
 
 class WaltIdCmd : CliktCommand(
-    name = "waltid",
-    help = """walt.id CLI
+    name = "waltid"
+) {
+
+    override fun help(context: Context) = """
+        walt.id CLI
 
         The walt.id CLI is a command line tool that allows you to onboard and 
         use a SSI (Self-Sovereign-Identity) ecosystem. You can manage 
@@ -103,9 +104,15 @@ class WaltIdCmd : CliktCommand(
         -vppa=max=2 \
         -vpp minimum-credentials \
         -vppa=min=1
-        """,
-    printHelpOnEmptyArgs = true
-) {
+        """.replace("\n", "  \n")
+
+    init {
+        installMordantMarkdown()
+    }
+
+
+    override val printHelpOnEmptyArgs = true
+
     init {
         subcommands(KeyCmd(), DidCmd(), VCCmd(), VPCmd())
 

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/Did.kt
@@ -2,13 +2,16 @@ package id.walt.cli.commands
 
 import com.github.ajalt.clikt.completion.CompletionCandidates
 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.option
 import com.github.ajalt.clikt.parameters.types.enum
 import id.walt.did.dids.DidService
 import kotlinx.coroutines.runBlocking
 
-class Did : CliktCommand(help = "Run commands on DIDs") {
+class Did : CliktCommand() {
+
+    override fun help(context: Context) = "Run commands on DIDs"
 
     //private val config by findOrSetObject { mutableMapOf<String, String>() }
 

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCmd.kt
@@ -1,16 +1,18 @@
 package id.walt.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.core.subcommands
 import id.walt.cli.util.WaltIdCmdHelpOptionMessage
 
 class DidCmd : CliktCommand(
-    name = "did",
-    help = "DID management features.",
-    printHelpOnEmptyArgs = true
+    name = "did"
 ) {
 
+    override fun help(context: Context) = "DID management features."
+    override val printHelpOnEmptyArgs = true
+
     init {
         subcommands(DidCreateCmd(), DidResolveCmd())
 
@@ -21,5 +23,3 @@ class DidCmd : CliktCommand(
 
     override fun run(): Unit {}
 }
-
-fun main(args: Array<String>) = DidCmd().main(args)
diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt
@@ -1,8 +1,6 @@
 package id.walt.cli.commands
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.terminal
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help
@@ -15,7 +13,6 @@ import id.walt.cli.util.*
 import id.walt.did.dids.registrar.dids.DidKeyCreateOptions
 import id.walt.did.dids.registrar.dids.DidWebCreateOptions
 import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.net.URLEncoder
 import kotlin.io.path.Path
@@ -24,8 +21,9 @@ import kotlin.io.path.exists
 import kotlin.io.path.writeText
 
 class DidCreateCmd : CliktCommand(
-    name = "create",
-    help = """Create a Decentralized Identifier (DID).
+    name = "create"
+) {
+    override fun help(context: Context) = """Create a Decentralized Identifier (DID).
         
         Example usage:
         --------------
@@ -34,8 +32,11 @@ class DidCreateCmd : CliktCommand(
         waltid did create -m jwk
         waltid did create -m web -wd example.com
         waltid did create -m web -wd example.com -wp /alice/bob
-    """
-) {
+    """.replace("\n", "  \n")
+
+    init {
+        installMordantMarkdown()
+    }
 
     init {
         context {

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidResolveCmd.kt
@@ -1,7 +1,9 @@
 package id.walt.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.context
+import com.github.ajalt.clikt.core.installMordantMarkdown
 import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required
@@ -14,23 +16,28 @@ import id.walt.cli.util.WaltIdCmdHelpOptionMessage
 import kotlinx.coroutines.runBlocking
 
 class DidResolveCmd : CliktCommand(
-    name = "resolve",
-    help = """Resolve the document associated with the input Decentralized Identifier (DID).
+    name = "resolve"
+) {
+    override fun help(context: Context) = """Resolve the document associated with the input Decentralized Identifier (DID).
         
         Example usage:
         --------------
         waltid did resolve -d did:key:z6Mkp7AVwvWxnsNDuSSbf19sgKzrx223WY95AqZyAGifFVyV
-    """,
-    printHelpOnEmptyArgs = true
-) {
+    """.replace("\n", "  \n")
+
+    init {
+        installMordantMarkdown()
+    }
+
+    override val printHelpOnEmptyArgs = true
 
     init {
         context {
             localization = WaltIdCmdHelpOptionMessage
         }
     }
 
-    val print : PrettyPrinter = PrettyPrinter(this)
+    val print: PrettyPrinter = PrettyPrinter(this)
     private val did by option("-d", "-did")
         .help("The DID to be resolved.")
         .required()
@@ -46,4 +53,4 @@ class DidResolveCmd : CliktCommand(
             print.box(prettyJsonString)
         }
     }
-}
+}
diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyCmd.kt
@@ -1,17 +1,19 @@
 package id.walt.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 import id.walt.cli.util.WaltIdCmdHelpOptionMessage
 
 class KeyCmd : CliktCommand(
-    name = "key",
-    help = "Key management features.",
-    printHelpOnEmptyArgs = true
+    name = "key"
 ) {
 
+    override fun help(context: Context) = "Key management features."
+    override val printHelpOnEmptyArgs = true
+
     init {
         subcommands(KeyGenerateCmd(), KeyConvertCmd())
 
@@ -24,5 +26,3 @@ class KeyCmd : CliktCommand(
 
     override fun run() = Unit
 }
-
-fun main(args: Array<String>) = KeyCmd().main(args)