Update to Kotlin 1.9.20

Since expect/actual classes are in Beta, their use has been removed as much as reasonably possible. The removals in the public API are probably because of changes in the serialization plugin with Kotlin 1.9.20. However, they are unlikely to affect anyone since only generated symbols that aren't supposed to be accessed directly were touched.
kordlib · Nov 1, 2023 · d7edcc5 · d7edcc5
1 parent a4f7143
commit d7edcc5
Show file tree

Hide file tree

Showing 25 changed files with 47 additions and 651 deletions.
diff --git a/buildSrc/src/main/kotlin/Compiler.kt b/buildSrc/src/main/kotlin/Compiler.kt
@@ -27,6 +27,7 @@ object Jvm {
 fun KotlinCommonCompilerOptions.applyKordCompilerOptions() {
     allWarningsAsErrors = true
     progressiveMode = true
+    freeCompilerArgs.add("-Xexpect-actual-classes")
 }
 
 fun KotlinSourceSet.applyKordOptIns() {

diff --git a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts
@@ -8,16 +8,14 @@ repositories {
 
 kotlin {
     jvm()
-    js(IR) {
+    js {
         nodejs()
     }
     jvmToolchain(Jvm.target)
 
-    targets {
-        all {
-            compilations.all {
-                compilerOptions.options.applyKordCompilerOptions()
-            }
+    targets.all {
+        compilations.all {
+            compilerOptions.options.applyKordCompilerOptions()
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     org.jetbrains.kotlin.jvm

diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -26,7 +26,7 @@ kotlin {
     explicitApi()
 
     jvm()
-    js(IR) {
+    js {
         nodejs()
     }
     jvmToolchain(Jvm.target)
@@ -37,6 +37,8 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         all {
             applyKordOptIns()
@@ -53,14 +55,9 @@ kotlin {
         val nonJvmMain by creating {
             dependsOn(commonMain.get())
         }
-        targets
-            .map { it.name }
-            .filter { it != "jvm" && it != "metadata" }
-            .forEach { target ->
-                sourceSets.getByName("${target}Main") {
-                    dependsOn(nonJvmMain)
-                }
-            }
+        jsMain {
+            dependsOn(nonJvmMain)
+        }
     }
 }
 

diff --git a/common/api/common.api b/common/api/common.api
diff --git a/common/src/commonMain/kotlin/ConcurrentHashMap.kt b/common/src/commonMain/kotlin/ConcurrentHashMap.kt
@@ -8,4 +8,4 @@ import dev.kord.common.annotation.KordInternal
  * @suppress
  */
 @KordInternal
-public expect class ConcurrentHashMap<K, V>() : MutableMap<K, V>
+public expect fun <K, V> concurrentHashMap(): MutableMap<K, V>
diff --git a/common/src/commonMain/kotlin/http/HttpEngine.kt b/common/src/commonMain/kotlin/http/HttpEngine.kt
@@ -5,4 +5,4 @@ import io.ktor.client.engine.*
 
 /** @suppress */
 @KordInternal
-public expect object HttpEngine : HttpClientEngineFactory<HttpClientEngineConfig>
+public expect fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig>
diff --git a/common/src/jsMain/kotlin/HttpEngine.kt b/common/src/jsMain/kotlin/HttpEngine.kt
@@ -1,8 +1,9 @@
 package dev.kord.common.http
 
 import dev.kord.common.annotation.KordInternal
+import io.ktor.client.engine.*
 import io.ktor.client.engine.js.*
 
 /** @suppress */
 @KordInternal
-public actual typealias HttpEngine = Js
+public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = Js
diff --git a/common/src/jvmMain/kotlin/ConcurrentHashMap.kt b/common/src/jvmMain/kotlin/ConcurrentHashMap.kt
@@ -1,7 +1,8 @@
 package dev.kord.common
 
 import dev.kord.common.annotation.KordInternal
+import java.util.concurrent.ConcurrentHashMap
 
 /** @suppress */
 @KordInternal
-public actual typealias ConcurrentHashMap<K, V> = java.util.concurrent.ConcurrentHashMap<K, V>
+public actual fun <K, V> concurrentHashMap(): MutableMap<K, V> = ConcurrentHashMap()
diff --git a/common/src/jvmMain/kotlin/http/HttpEngine.kt b/common/src/jvmMain/kotlin/http/HttpEngine.kt
@@ -6,4 +6,4 @@ import io.ktor.client.engine.cio.*
 
 /** @suppress */
 @KordInternal
-public actual object HttpEngine : HttpClientEngineFactory<HttpClientEngineConfig> by CIO
+public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = CIO
diff --git a/common/src/nonJvmMain/kotlin/ConcurrentHashMap.kt b/common/src/nonJvmMain/kotlin/ConcurrentHashMap.kt
@@ -5,6 +5,4 @@ import dev.kord.common.annotation.KordInternal
 
 /** @suppress */
 @KordInternal
-// using an actual typealias seems to be broken in Kotlin/JS 1.9.0
-// public actual typealias ConcurrentHashMap<K, V> = ConcurrentMutableMap<K, V>
-public actual class ConcurrentHashMap<K, V> : MutableMap<K, V> by ConcurrentMutableMap()
+public actual fun <K, V> concurrentHashMap(): MutableMap<K, V> = ConcurrentMutableMap()
diff --git a/core/api/core.api b/core/api/core.api
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 kotlin {
     js {
         nodejs {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10000" // KordEventDropTest is too slow for default 2 seconds timeout
                 }
-            })
+            }
         }
     }
 

diff --git a/core/src/commonMain/kotlin/builder/kord/KordBuilderUtil.kt b/core/src/commonMain/kotlin/builder/kord/KordBuilderUtil.kt
@@ -2,7 +2,7 @@ package dev.kord.core.builder.kord
 
 import dev.kord.common.annotation.KordInternal
 import dev.kord.common.entity.Snowflake
-import dev.kord.common.http.HttpEngine
+import dev.kord.common.http.httpEngine
 import io.ktor.client.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.websocket.*
@@ -33,7 +33,7 @@ public fun HttpClient?.configure(): HttpClient {
         isLenient = true
     }
 
-    return HttpClient(HttpEngine) {
+    return HttpClient(httpEngine()) {
         defaultConfig()
         install(ContentNegotiation) {
             json(json)

diff --git a/core/src/commonMain/kotlin/cache/KordCache.kt b/core/src/commonMain/kotlin/cache/KordCache.kt
@@ -7,7 +7,7 @@ import dev.kord.cache.api.delegate.DelegatingDataCache
 import dev.kord.cache.api.delegate.EntrySupplier
 import dev.kord.cache.map.MapLikeCollection
 import dev.kord.cache.map.internal.MapEntryCache
-import dev.kord.common.ConcurrentHashMap
+import dev.kord.common.concurrentHashMap
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.cache.data.*
 
@@ -16,7 +16,7 @@ public typealias Generator<I, T> = (cache: DataCache, description: DataDescripti
 public class KordCacheBuilder {
 
     /**
-     * The default behavior for all types not explicitly configured, by default a [ConcurrentHashMap] is supplied.
+     * The default behavior for all types not explicitly configured, by default a [concurrentHashMap] is supplied.
      */
     public var defaultGenerator: Generator<Any, Any> = { cache, description ->
        MapEntryCache(cache, description, MapLikeCollection.concurrentHashMap())