Update Kotlin to 1.9.0 (#422)

ajalt · Jul 10, 2023 · 9eb6683 · 9eb6683
1 parent f3f5d08
commit 9eb6683
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - Added `MordantHelpFormatter.renderAttachedOptionValue` that you can override to change how option values are shown, e.g. if you want option to show as `--option <value>` instead of `--option=<value>`. ([#416](https://github.com/ajalt/clikt/issues/416))
 - Added `option().optionalValueLazy{}`, which work like `optionalValue()` but the default value is computed lazily. ([#381](https://github.com/ajalt/clikt/issues/381))
 
+### Changed
+- Updated Kotlin to 1.9.0
+
 ## 4.0.0
 ### Added
 - Added `Context.errorEncountered` which is true if parsing has continued after an error was encountered.

diff --git a/clikt/build.gradle.kts b/clikt/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
     jvm()
-    js(IR) {
+    js {
         nodejs()
         browser()
     }

diff --git a/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.mpp
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
 import platform.posix.getenv
 

diff --git a/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.output
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.MemScope
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr

diff --git a/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.mpp
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.allocArray
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.toKStringFromUtf16

diff --git a/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.output
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.MemScope
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr

diff --git a/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.mpp
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
 import platform.posix.getenv
 

diff --git a/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.output
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.MemScope
 import kotlinx.cinterop.alloc
 import kotlinx.cinterop.ptr

diff --git a/clikt/src/nativeMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/nativeMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
@@ -1,12 +1,12 @@
+@file:OptIn(ExperimentalForeignApi::class, ExperimentalNativeApi::class)
+
 package com.github.ajalt.clikt.mpp
 
-import kotlinx.cinterop.ByteVar
-import kotlinx.cinterop.allocArray
-import kotlinx.cinterop.memScoped
-import kotlinx.cinterop.toKString
+import kotlinx.cinterop.*
 import platform.posix.fclose
 import platform.posix.fgets
 import platform.posix.fopen
+import kotlin.experimental.ExperimentalNativeApi
 import kotlin.system.exitProcess
 
 private val LETTER_OR_DIGIT_RE = Regex("""[a-zA-Z0-9]""")

diff --git a/clikt/src/nativeMain/kotlin/com/github/ajalt/clikt/output/Editor.kt b/clikt/src/nativeMain/kotlin/com/github/ajalt/clikt/output/Editor.kt
@@ -1,9 +1,12 @@
+@file:OptIn(ExperimentalForeignApi::class)
+
 package com.github.ajalt.clikt.output
 
 import com.github.ajalt.clikt.core.CliktError
 import com.github.ajalt.clikt.mpp.isWindowsMpp
 import com.github.ajalt.clikt.mpp.readEnvvar
 import com.github.ajalt.clikt.mpp.readFileIfExists
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.MemScope
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.toKString

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 
 [libraries]
 mordant = "com.github.ajalt.mordant:mordant:2.0.0"
@@ -14,5 +14,5 @@ kodein = "org.kodein.di:kodein-di-generic-jvm:5.2.0"
 kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
 
 [plugins]
-dokka = "org.jetbrains.dokka:1.8.10"
+dokka = "org.jetbrains.dokka:1.8.20"
 publish = "com.vanniktech.maven.publish:0.25.2"