Update to Kotlin 1.9.20-Beta

The changes in the public API are probably because of changes in the serialization plugin with Kotlin 1.9.20-Beta. However, they are unlikely to affect anyone since only generated symbols that aren't supposed to be accessed directly were touched.
kordlib · Sep 14, 2023 · fbc2584 · fbc2584
1 parent 4aa9701
commit fbc2584
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 616 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
@@ -13,11 +13,9 @@ kotlin {
     }
     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
@@ -37,6 +37,8 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         all {
             applyKordOptIns()
@@ -53,14 +55,10 @@ 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)
-                }
-            }
+        // TODO also add for nativeMain when native is supported
+        jsMain {
+            dependsOn(nonJvmMain)
+        }
     }
 }
 

diff --git a/common/api/common.api b/common/api/common.api
diff --git a/core/api/core.api b/core/api/core.api
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -6,11 +6,11 @@ plugins {
 kotlin {
     js {
         nodejs {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10000" // KordEventDropTest is too slow for default 2 seconds timeout
                 }
-            })
+            }
         }
     }
 

diff --git a/gateway/api/gateway.api b/gateway/api/gateway.api
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
 # api dependencies
-kotlin = "1.9.10" # https://github.com/JetBrains/kotlin
+kotlin = "1.9.20-Beta" # https://github.com/JetBrains/kotlin
 ktor = "2.3.3" # https://github.com/ktorio/ktor
 kotlinx-coroutines = "1.7.3" # https://github.com/Kotlin/kotlinx.coroutines
 kotlinx-serialization = "1.6.0" # https://github.com/Kotlin/kotlinx.serialization
@@ -16,7 +16,7 @@ stately = "2.0.0-rc1" # https://github.com/touchlab/Stately
 fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib
 
 # code generation
-ksp = "1.9.10-1.0.13" # https://github.com/google/ksp
+ksp = "1.9.20-Beta-1.0.13" # https://github.com/google/ksp
 kotlinpoet = "1.14.2" # https://github.com/square/kotlinpoet
 
 # tests

diff --git a/rest/api/rest.api b/rest/api/rest.api
diff --git a/voice/api/voice.api b/voice/api/voice.api
@@ -556,7 +556,6 @@ public final class dev/kord/voice/gateway/DefaultVoiceGatewayData {
 
 public final class dev/kord/voice/gateway/Heartbeat : dev/kord/voice/gateway/Command {
 	public static final field Companion Ldev/kord/voice/gateway/Heartbeat$Companion;
-	public synthetic fun <init> (IJLkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (J)V
 	public final fun component1 ()J
 	public final fun copy (J)Ldev/kord/voice/gateway/Heartbeat;
@@ -565,7 +564,6 @@ public final class dev/kord/voice/gateway/Heartbeat : dev/kord/voice/gateway/Com
 	public final fun getNonce ()J
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Heartbeat;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Heartbeat$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -585,7 +583,6 @@ public final class dev/kord/voice/gateway/Heartbeat$Companion {
 
 public final class dev/kord/voice/gateway/HeartbeatAck : dev/kord/voice/gateway/VoiceEvent {
 	public static final field Companion Ldev/kord/voice/gateway/HeartbeatAck$Companion;
-	public synthetic fun <init> (IJLkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (J)V
 	public final fun component1 ()J
 	public final fun copy (J)Ldev/kord/voice/gateway/HeartbeatAck;
@@ -594,7 +591,6 @@ public final class dev/kord/voice/gateway/HeartbeatAck : dev/kord/voice/gateway/
 	public final fun getNonce ()J
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/HeartbeatAck;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/HeartbeatAck$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -614,7 +610,6 @@ public final class dev/kord/voice/gateway/HeartbeatAck$Companion {
 
 public final class dev/kord/voice/gateway/Hello : dev/kord/voice/gateway/VoiceEvent {
 	public static final field Companion Ldev/kord/voice/gateway/Hello$Companion;
-	public synthetic fun <init> (ISDLkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (SD)V
 	public final fun component1 ()S
 	public final fun component2 ()D
@@ -625,7 +620,6 @@ public final class dev/kord/voice/gateway/Hello : dev/kord/voice/gateway/VoiceEv
 	public final fun getVersion ()S
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Hello;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Hello$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -645,7 +639,6 @@ public final class dev/kord/voice/gateway/Hello$Companion {
 
 public final class dev/kord/voice/gateway/Identify : dev/kord/voice/gateway/Command {
 	public static final field Companion Ldev/kord/voice/gateway/Identify$Companion;
-	public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;)V
 	public final fun component1 ()Ldev/kord/common/entity/Snowflake;
 	public final fun component2 ()Ldev/kord/common/entity/Snowflake;
@@ -660,7 +653,6 @@ public final class dev/kord/voice/gateway/Identify : dev/kord/voice/gateway/Comm
 	public final fun getUserId ()Ldev/kord/common/entity/Snowflake;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Identify;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Identify$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -700,7 +692,6 @@ public final class dev/kord/voice/gateway/OpCode : java/lang/Enum {
 public final class dev/kord/voice/gateway/Ready : dev/kord/voice/gateway/VoiceEvent {
 	public static final field Companion Ldev/kord/voice/gateway/Ready$Companion;
 	public synthetic fun <init> (ILjava/lang/String;ILjava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (ILkotlin/UInt;Ljava/lang/String;ILjava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1-pVg5ArA ()I
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()I
@@ -714,7 +705,6 @@ public final class dev/kord/voice/gateway/Ready : dev/kord/voice/gateway/VoiceEv
 	public final fun getSsrc-pVg5ArA ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Ready;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Ready$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -734,7 +724,6 @@ public final class dev/kord/voice/gateway/Ready$Companion {
 
 public final class dev/kord/voice/gateway/Resume : dev/kord/voice/gateway/Command {
 	public static final field Companion Ldev/kord/voice/gateway/Resume$Companion;
-	public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;)V
 	public final fun component1 ()Ldev/kord/common/entity/Snowflake;
 	public final fun component2 ()Ljava/lang/String;
@@ -747,7 +736,6 @@ public final class dev/kord/voice/gateway/Resume : dev/kord/voice/gateway/Comman
 	public final fun getToken ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Resume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Resume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -772,7 +760,6 @@ public final class dev/kord/voice/gateway/Resumed : dev/kord/voice/gateway/Voice
 
 public final class dev/kord/voice/gateway/SelectProtocol : dev/kord/voice/gateway/Command {
 	public static final field Companion Ldev/kord/voice/gateway/SelectProtocol$Companion;
-	public synthetic fun <init> (ILjava/lang/String;Ldev/kord/voice/gateway/SelectProtocol$Data;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;Ldev/kord/voice/gateway/SelectProtocol$Data;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ldev/kord/voice/gateway/SelectProtocol$Data;
@@ -783,7 +770,6 @@ public final class dev/kord/voice/gateway/SelectProtocol : dev/kord/voice/gatewa
 	public final fun getProtocol ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SelectProtocol;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/SelectProtocol$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -803,7 +789,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Companion {
 
 public final class dev/kord/voice/gateway/SelectProtocol$Data {
 	public static final field Companion Ldev/kord/voice/gateway/SelectProtocol$Data$Companion;
-	public synthetic fun <init> (ILjava/lang/String;ILdev/kord/voice/EncryptionMode;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;ILdev/kord/voice/EncryptionMode;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()I
@@ -816,7 +801,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Data {
 	public final fun getPort ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SelectProtocol$Data;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/SelectProtocol$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -836,7 +820,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Data$Companion {
 
 public final class dev/kord/voice/gateway/SendSpeaking : dev/kord/voice/gateway/Command {
 	public static final field Companion Ldev/kord/voice/gateway/SendSpeaking$Companion;
-	public synthetic fun <init> (ILdev/kord/voice/SpeakingFlags;ILkotlin/UInt;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Ldev/kord/voice/SpeakingFlags;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ldev/kord/voice/SpeakingFlags;
 	public final fun component2 ()I
@@ -849,7 +832,6 @@ public final class dev/kord/voice/gateway/SendSpeaking : dev/kord/voice/gateway/
 	public final fun getSsrc-pVg5ArA ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SendSpeaking;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/SendSpeaking$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -869,7 +851,6 @@ public final class dev/kord/voice/gateway/SendSpeaking$Companion {
 
 public final class dev/kord/voice/gateway/SessionDescription : dev/kord/voice/gateway/VoiceEvent {
 	public static final field Companion Ldev/kord/voice/gateway/SessionDescription$Companion;
-	public synthetic fun <init> (ILdev/kord/voice/EncryptionMode;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ldev/kord/voice/EncryptionMode;Ljava/util/List;)V
 	public final fun component1 ()Ldev/kord/voice/EncryptionMode;
 	public final fun component2 ()Ljava/util/List;
@@ -880,7 +861,6 @@ public final class dev/kord/voice/gateway/SessionDescription : dev/kord/voice/ga
 	public final fun getSecretKey ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SessionDescription;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -900,7 +880,6 @@ public final class dev/kord/voice/gateway/SessionDescription$Companion {
 
 public final class dev/kord/voice/gateway/Speaking : dev/kord/voice/gateway/VoiceEvent {
 	public static final field Companion Ldev/kord/voice/gateway/Speaking$Companion;
-	public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Lkotlin/UInt;Ldev/kord/voice/SpeakingFlags;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Ldev/kord/common/entity/Snowflake;ILdev/kord/voice/SpeakingFlags;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ldev/kord/common/entity/Snowflake;
 	public final fun component2-pVg5ArA ()I
@@ -913,7 +892,6 @@ public final class dev/kord/voice/gateway/Speaking : dev/kord/voice/gateway/Voic
 	public final fun getUserId ()Ldev/kord/common/entity/Snowflake;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Speaking;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
 public final class dev/kord/voice/gateway/Speaking$$serializer : kotlinx/serialization/internal/GeneratedSerializer {