Bring back & Any with Kotlin 2.0.20-Beta1

lukellmann · Jun 24, 2024 · 9255520 · 9255520
1 parent 57e6a69
commit 9255520
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -8,12 +8,12 @@ repositories {
 }
 
 dependencies {
-	implementation(kotlin("gradle-plugin", version = "2.0.0"))
-	implementation(kotlin("serialization", version = "2.0.0"))
+	implementation(kotlin("gradle-plugin", version = "2.0.20-Beta1"))
+	implementation(kotlin("serialization", version = "2.0.20-Beta1"))
 
 	implementation("com.github.ben-manes", "gradle-versions-plugin", "0.50.0")
 	implementation("com.github.jakemarsden", "git-hooks-gradle-plugin", "0.0.2")
-	implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "2.0.0-1.0.21")
+	implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "2.0.20-Beta1-1.0.22")
 	implementation("dev.yumi", "yumi-gradle-licenser", "1.1.2")
 	implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.6")
 	implementation("org.jetbrains.dokka", "dokka-gradle-plugin", "1.9.20")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 detekt = "1.23.6"  # Note: Plugin versions must be updated in buildSrc/build.gradle.kts
 dokka = "1.9.20"  # Note: Plugin versions must be updated in buildSrc/build.gradle.kts
-kotlin = "2.0.0"  # Note: Plugin versions must be updated in buildSrc/build.gradle.kts
+kotlin = "2.0.20-Beta1"  # Note: Plugin versions must be updated in buildSrc/build.gradle.kts
 
 commons-validator = "1.8.0"
 groovy = "3.0.21"
@@ -12,9 +12,9 @@ jsoup = "1.17.2"
 junit = "5.10.2"
 kaml = "0.59.0"
 koin = "3.5.6"
-kord = "kotlin-k2-SNAPSHOT"
+kord = "0.15.0-SNAPSHOT"
 #kord = "0.12.0"
-ksp = "2.0.0-1.0.21"
+ksp = "2.0.20-Beta1-1.0.22"
 ktor = "2.3.11"
 kx-coro = "1.8.1"
 kx-ser = "1.6.3"

diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Maps.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Maps.kt
@@ -10,13 +10,13 @@ import dev.kord.common.annotation.KordPreview
 import dev.kord.core.event.Event
 
 /** Type alias representing a string keyed map. **/
-public typealias StringKeyedMap<T> = Map<String, T>
+public typealias StringKeyedMap<T> = Map<String, T & Any>
 
 /** Type alias representing a map with string keys and values. **/
 public typealias StringMap = StringKeyedMap<String>
 
 /** Type alias representing a mutable string keyed map. **/
-public typealias MutableStringKeyedMap<T> = MutableMap<String, T>
+public typealias MutableStringKeyedMap<T> = MutableMap<String, T & Any>
 
 /** Type alias representing a mutable map with string keys and values. **/
 public typealias MutableStringMap = MutableStringKeyedMap<String>