From b87775d354633e9e55e58ebc0cb57cb55ab09cb0 Mon Sep 17 00:00:00 2001
From: AJ <aj@alt>
Date: Wed, 1 Nov 2023 11:44:13 -0700
Subject: [PATCH] Update to Kotlin 1.9.20

---
 clikt/build.gradle.kts                        | 39 -------------------
 .../com/github/ajalt/clikt/mpp/MppImpl.kt     |  0
 .../github/ajalt/clikt/output/EditorMPP.kt    |  0
 .../com/github/ajalt/clikt/mpp/MppImpl.kt     |  0
 .../github/ajalt/clikt/output/EditorMPP.kt    |  0
 .../com/github/ajalt/clikt/mpp/MppImpl.kt     |  0
 .../github/ajalt/clikt/output/EditorMPP.kt    |  0
 gradle/libs.versions.toml                     |  4 +-
 8 files changed, 2 insertions(+), 41 deletions(-)
 rename clikt/src/{linuxX64Main => linuxMain}/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt (100%)
 rename clikt/src/{linuxX64Main => linuxMain}/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt (100%)
 rename clikt/src/{nativeDarwinMain => macosMain}/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt (100%)
 rename clikt/src/{nativeDarwinMain => macosMain}/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt (100%)
 rename clikt/src/{mingwX64Main => mingwMain}/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt (100%)
 rename clikt/src/{mingwX64Main => mingwMain}/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt (100%)

diff --git a/clikt/build.gradle.kts b/clikt/build.gradle.kts
index 8c1dbb5b..0b0fcec3 100644
--- a/clikt/build.gradle.kts
+++ b/clikt/build.gradle.kts
@@ -1,6 +1,5 @@
 @file:Suppress("UNUSED_VARIABLE", "KotlinRedundantDiagnosticSuppress")
 
-
 plugins {
     kotlin("multiplatform")
     alias(libs.plugins.publish)
@@ -38,43 +37,5 @@ kotlin {
                 api(libs.jimfs)
             }
         }
-
-        val nativeMain by creating {
-            dependsOn(commonMain)
-        }
-        val linuxX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val mingwX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val nativeDarwinMain by creating {
-            dependsOn(nativeMain)
-        }
-        val macosX64Main by getting {
-            dependsOn(nativeDarwinMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(nativeDarwinMain)
-        }
-
-        val nativeTest by creating {
-            dependsOn(commonTest)
-        }
-        val linuxX64Test by getting {
-            dependsOn(nativeTest)
-        }
-        val mingwX64Test by getting {
-            dependsOn(nativeTest)
-        }
-        val nativeDarwinTest by creating {
-            dependsOn(nativeTest)
-        }
-        val macosX64Test by getting {
-            dependsOn(nativeDarwinTest)
-        }
-        val macosArm64Test by getting {
-            dependsOn(nativeDarwinTest)
-        }
     }
 }
diff --git a/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/linuxMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
similarity index 100%
rename from clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
rename to clikt/src/linuxMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
diff --git a/clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/linuxMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
similarity index 100%
rename from clikt/src/linuxX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
rename to clikt/src/linuxMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
diff --git a/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/macosMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
similarity index 100%
rename from clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
rename to clikt/src/macosMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
diff --git a/clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/macosMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
similarity index 100%
rename from clikt/src/nativeDarwinMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
rename to clikt/src/macosMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
diff --git a/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt b/clikt/src/mingwMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
similarity index 100%
rename from clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
rename to clikt/src/mingwMain/kotlin/com/github/ajalt/clikt/mpp/MppImpl.kt
diff --git a/clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt b/clikt/src/mingwMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
similarity index 100%
rename from clikt/src/mingwX64Main/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
rename to clikt/src/mingwMain/kotlin/com/github/ajalt/clikt/output/EditorMPP.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8694255b..ea763446 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 
 [libraries]
 mordant = "com.github.ajalt.mordant:mordant:2.2.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.9.0"
+dokka = "org.jetbrains.dokka:1.9.10"
 publish = "com.vanniktech.maven.publish:0.25.3"