Update dependencies

ajalt · ajalt · commit feeffc017cda · 2026-01-15T18:21:40.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ docs/index.md
 kotlin-js-store/
 .kotlin/
 site/
+.claude/
+CLAUDE.md
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
@@ -25,12 +22,20 @@ fun getPublishVersion(): String {
     return "$version.$buildNumber-SNAPSHOT"
 }
 
+dokka {
+    dokkaPublications.html {
+        outputDirectory.set(rootProject.rootDir.resolve("docs/api"))
+    }
+    pluginsConfiguration.html {
+        footerMessage.set("Copyright &copy; 2018 AJ Alt")
+    }
+}
 
-private val dokkaConfig = mapOf(
-    "org.jetbrains.dokka.base.DokkaBase" to """{
-        "footerMessage": "Copyright &copy; 2018 AJ Alt"
-    }"""
-)
+dependencies {
+    dokka(project(":clikt"))
+    dokka(project(":clikt-mordant"))
+    dokka(project(":clikt-mordant-markdown"))
+}
 
 subprojects {
     project.setProperty("VERSION_NAME", getPublishVersion())
@@ -46,18 +51,4 @@ subprojects {
     pluginManager.withPlugin("com.vanniktech.maven.publish") {
         apply(plugin = "org.jetbrains.dokka")
     }
-    tasks.withType<DokkaTask>().configureEach {
-        dokkaSourceSets.configureEach {
-            reportUndocumented.set(false)
-            skipDeprecated.set(false)
-        }
-    }
-    tasks.withType<DokkaTaskPartial>().configureEach {
-        pluginsMapConfiguration.set(dokkaConfig)
-    }
-}
-
-tasks.named<DokkaMultiModuleTask>("dokkaHtmlMultiModule") {
-    outputDirectory.set(rootProject.rootDir.resolve("docs/api"))
-    pluginsMapConfiguration.set(dokkaConfig)
 }
diff --git a/clikt-mordant-markdown/build.gradle.kts b/clikt-mordant-markdown/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -34,23 +33,23 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
-                api(kotlin("test"))
-                api(libs.kotest)
-                api(libs.coroutines.core)
-                api(libs.coroutines.test)
+                implementation(kotlin("test"))
+                implementation(libs.kotest)
+                implementation(libs.coroutines.core)
+                implementation(libs.coroutines.test)
             }
         }
 
         val jvmTest by getting {
             dependencies {
-                api(libs.systemrules)
-                api(libs.jimfs)
+                implementation(libs.systemrules)
+                implementation(libs.jimfs)
             }
         }
     }
 }
 
-tasks.withType<DokkaTaskPartial> {
+dokka {
     dokkaSourceSets.configureEach {
         includes.from("README.md")
     }
diff --git a/clikt-mordant/build.gradle.kts b/clikt-mordant/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
@@ -40,7 +39,7 @@ kotlin {
     }
 }
 
-tasks.withType<DokkaTaskPartial> {
+dokka {
     dokkaSourceSets.configureEach {
         includes.from("README.md")
     }
diff --git a/clikt/api/clikt.api b/clikt/api/clikt.api
diff --git a/clikt/build.gradle.kts b/clikt/build.gradle.kts
@@ -1,6 +1,6 @@
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 
 plugins {
@@ -37,18 +37,20 @@ kotlin {
 
 // https://youtrack.jetbrains.com/issue/KT-63014
 // https://github.com/Kotlin/kotlin-wasm-examples/blob/1b007347bf9f8a1ec3d420d30de1815768d5df02/nodejs-example/build.gradle.kts#L22
-rootProject.the<NodeJsRootExtension>().apply {
-    version = "22.0.0-nightly202404032241e8c5b3"
-    downloadBaseUrl = "https://nodejs.org/download/nightly"
+rootProject.plugins.withType<NodeJsPlugin> {
+    rootProject.the<NodeJsEnvSpec>().apply {
+        version.set("22.0.0-nightly202404032241e8c5b3")
+        downloadBaseUrl.set("https://nodejs.org/download/nightly")
+    }
 }
 
 rootProject.tasks.withType<KotlinNpmInstallTask>().configureEach {
     args.add("--ignore-engines")
 }
 
-tasks.withType<DokkaTaskPartial> {
+dokka {
+    moduleName.set("clikt-core")
     dokkaSourceSets.configureEach {
-        moduleName.set("clikt-core")
         includes.from("README.md")
     }
 }
diff --git a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/Context.kt b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/Context.kt
@@ -162,7 +162,7 @@ class Context private constructor(
     fun findRoot(): Context {
         var ctx = this
         while (ctx.parent != null) {
-            ctx = ctx.parent!!
+            ctx = ctx.parent
         }
         return ctx
     }
diff --git a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/exceptions.kt b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/core/exceptions.kt
@@ -10,15 +10,15 @@ import kotlin.jvm.JvmOverloads
 /**
  * An exception during command line processing that should be shown to the user.
  *
- * If calling [CliktCommand.main], these exceptions will be caught and the appropriate info will be printed.
+ * If calling [CoreCliktCommand.main], these exceptions will be caught and the appropriate info will be printed.
  */
 open class CliktError(
     message: String? = null,
     cause: Exception? = null,
     /**
      * The value to use as the exit code for the process.
      *
-     * If you use [CliktCommand.main], it will pass this value to `exitProcess` after printing
+     * If you use [CoreCliktCommand.main], it will pass this value to `exitProcess` after printing
      * [message]. Defaults to 1.
      */
     val statusCode: Int = 1,
@@ -52,7 +52,7 @@ class PrintHelpMessage(
     /**
      * The value to use as the exit code for the process.
      *
-     * If you use [CliktCommand.main], it will pass this value to `exitProcess` after printing
+     * If you use [CoreCliktCommand.main], it will pass this value to `exitProcess` after printing
      * [message]. Defaults to 0.
      */
     statusCode: Int = 0,
@@ -69,7 +69,7 @@ open class PrintMessage(
     /**
      * The value to use as the exit code for the process.
      *
-     * If you use [CliktCommand.main], it will pass this value to `exitProcess` after printing
+     * If you use [CoreCliktCommand.main], it will pass this value to `exitProcess` after printing
      * [message]. Defaults to 0.
      */
     statusCode: Int = 0,
@@ -110,7 +110,7 @@ open class UsageError(
     /**
      * The value to use as the exit code for the process.
      *
-     * If you use [CliktCommand.main], it will pass this value to `exitProcess` after printing
+     * If you use [CoreCliktCommand.main], it will pass this value to `exitProcess` after printing
      * [message]. Defaults to 1.
      */
     statusCode: Int = 1,
diff --git a/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parameters/options/FlagOption.kt b/clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parameters/options/FlagOption.kt
@@ -37,7 +37,7 @@ fun RawOption.flag(
  * A [flag] that doesn't have a default value.
  *
  * You will usually want [flag] instead of this function, but this can be useful if you need to use
- * a [transformAll] method like [required] or [prompt].
+ * a [transformAll] method like [required] or `prompt`.
  */
 fun RawOption.nullableFlag(vararg secondaryNames: String): NullableOption<Boolean, Boolean> {
     return boolean()
diff --git a/docs/commands.md b/docs/commands.md
@@ -531,5 +531,5 @@ applies a series of transformations to it, printing the final result:
 [issueMessage]:                  api/clikt/com.github.ajalt.clikt.core/-base-clikt-command/issue-message.html
 [printing-to-stdout-and-stderr]: quickstart.md#printing-to-stdout-and-stderr
 [requireObject]:                 api/clikt/com.github.ajalt.clikt.core/require-object.html
-[run]:                           api/clikt/com.github.ajalt.clikt.core/-runnable-clikt-command/run.html
+[run]:                           api/clikt/com.github.ajalt.clikt.core/-core-clikt-command/run.html
 [subcommands]:                   api/clikt/com.github.ajalt.clikt.core/subcommands.html
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,12 @@
 VERSION_NAME=5.0.3
 # Silence the compile warning that MPP is experimental
 kotlin.mpp.stability.nowarn=true
+# Enable Dokka V2 mode
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 # Enable experimental cross compilation
 kotlin.native.enableKlibsCrossCompilation=true
 # gradle-maven-publish configuration
-SONATYPE_HOST=DEFAULT
+SONATYPE_HOST=CENTRAL_PORTAL
 RELEASE_SIGNING_ENABLED=true
 GROUP=com.github.ajalt.clikt
 POM_DESCRIPTION=Multiplatform command line interface parsing for Kotlin
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.1.0"
-coroutines = "1.9.0"
-mordant = "3.0.1"
+kotlin = "2.3.0"
+coroutines = "1.10.2"
+mordant = "3.0.2"
 
 [libraries]
 mordant = {module = "com.github.ajalt.mordant:mordant", version.ref = "mordant"}
@@ -10,15 +10,15 @@ mordant-markdown = {module = "com.github.ajalt.mordant:mordant-markdown", versio
 # used in tests
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotest =  "io.kotest:kotest-assertions-core:5.9.1"
+kotest = "io.kotest:kotest-assertions-core:5.9.1"
 systemrules = "com.github.stefanbirkner:system-rules:1.19.0"
-jimfs = "com.google.jimfs:jimfs:1.3.0"
+jimfs = "com.google.jimfs:jimfs:1.3.1"
 
 # used in samples
 kodein = "org.kodein.di:kodein-di-generic-jvm:6.5.5"
-kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
+kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
 
 [plugins]
-dokka = "org.jetbrains.dokka:1.9.20"
-publish = "com.vanniktech.maven.publish:0.30.0"
-kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.16.3"
+dokka = "org.jetbrains.dokka:2.1.0"
+publish = "com.vanniktech.maven.publish:0.35.0"
+kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.18.1"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -156,7 +156,7 @@ nav:
       - 'Arguments': api/clikt/com.github.ajalt.clikt.parameters.arguments/
       - 'Parameter Type Conversions': api/clikt/com.github.ajalt.clikt.parameters.types/
       - 'Output Formatting': api/clikt/com.github.ajalt.clikt.output/
-      - 'All Modules': api/clikt/
+      - 'All Modules': api/
   - 'Releases':
       - 'Change Log': changelog.md
       - 'Upgrading to Newer Releases': migration.md
diff --git a/prepare_docs.sh b/prepare_docs.sh
@@ -5,7 +5,7 @@
 # It requires Python to run.
 # Install the packages with the following command:
 # Install the packages: `pip install mkdocs-material`
-# Build the api docs: `./gradlew dokkaHtmlMultiModule`
+# Build the api docs: `./gradlew dokkaGenerateHtml`
 # Then run this script to prepare the docs for the website.
 # Finally, run `mkdocs serve` to preview the site locally or `mkdocs build` to build the site.
 
diff --git a/test/build.gradle.kts b/test/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import org.jetbrains.dokka.gradle.DokkaTaskPartial`
`2`	`1`	`import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl`
`3`	`2`
`4`	`3`	`plugins {`
`@@ -34,23 +33,23 @@ kotlin {`
`34`	`33`
`35`	`34`	`val commonTest by getting {`
`36`	`35`	`dependencies {`
`37`		`- api(kotlin("test"))`
`38`		`- api(libs.kotest)`
`39`		`- api(libs.coroutines.core)`
`40`		`- api(libs.coroutines.test)`
	`36`	`+ implementation(kotlin("test"))`
	`37`	`+ implementation(libs.kotest)`
	`38`	`+ implementation(libs.coroutines.core)`
	`39`	`+ implementation(libs.coroutines.test)`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`val jvmTest by getting {`
`45`	`44`	`dependencies {`
`46`		`- api(libs.systemrules)`
`47`		`- api(libs.jimfs)`
	`45`	`+ implementation(libs.systemrules)`
	`46`	`+ implementation(libs.jimfs)`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
`53`		`-tasks.withType<DokkaTaskPartial> {`
	`52`	`+dokka {`
`54`	`53`	`dokkaSourceSets.configureEach {`
`55`	`54`	`includes.from("README.md")`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ class Context private constructor(`
`162`	`162`	`fun findRoot(): Context {`
`163`	`163`	`var ctx = this`
`164`	`164`	`while (ctx.parent != null) {`
`165`		`- ctx = ctx.parent!!`
	`165`	`+ ctx = ctx.parent`
`166`	`166`	`}`
`167`	`167`	`return ctx`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ fun RawOption.flag(`
`37`	`37`	`* A [flag] that doesn't have a default value.`
`38`	`38`	`*`
`39`	`39`	`* You will usually want [flag] instead of this function, but this can be useful if you need to use`
`40`		`- * a [transformAll] method like [required] or [prompt].`
	`40`	+ * a [transformAll] method like [required] or `prompt`.
`41`	`41`	`*/`
`42`	`42`	`fun RawOption.nullableFlag(vararg secondaryNames: String): NullableOption<Boolean, Boolean> {`
`43`	`43`	`return boolean()`