Switch gradle plugins; fails compilation

Kord-Extensions · May 21, 2024 · 9199a05 · 9199a05
1 parent af275f5
commit 9199a05
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -8,12 +8,12 @@ repositories {
 }
 
 dependencies {
-	implementation(kotlin("gradle-plugin", version = "1.9.24"))
-	implementation(kotlin("serialization", version = "1.9.24"))
+	implementation(kotlin("gradle-plugin", version = "2.0.0"))
+	implementation(kotlin("serialization", version = "2.0.0"))
 
 	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", "1.9.24-1.0.20")
+	implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "2.0.0-RC3-1.0.20")
 	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/buildSrc/src/main/kotlin/kordex-module.gradle.kts b/buildSrc/src/main/kotlin/kordex-module.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -77,7 +78,7 @@ tasks {
 			}
 
 			kotlinOptions {
-				jvmTarget = "13"
+				compilerOptions.jvmTarget.set(JvmTarget.JVM_13)
 			}
 		}
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ jsoup = "1.17.2"
 junit = "5.10.2"
 kaml = "0.59.0"
 koin = "3.5.6"
-kord = "0.14.0-SNAPSHOT"
+kord = "kotlin-k2-SNAPSHOT"
 #kord = "0.12.0"
 ksp = "2.0.0-RC3-1.0.20"
 ktor = "2.3.11"

diff --git a/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt b/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt
@@ -46,6 +46,7 @@ import dev.kord.rest.request.KtorRequestException
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.koin.core.component.inject
+import java.lang.Compiler.command
 import java.util.*
 import javax.naming.InvalidNameException
 
@@ -383,7 +384,7 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 
 					option.translate(command, arg)
 
-					if (option is BaseChoiceBuilder<*> && arg.converter.genericBuilder.autoCompleteCallback != null) {
+					if (option is BaseChoiceBuilder<*, *> && arg.converter.genericBuilder.autoCompleteCallback != null) {
 						option.choices?.clear()
 					}
 
@@ -405,7 +406,7 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 
 					option.translate(command, arg)
 
-					if (option is BaseChoiceBuilder<*> && arg.converter.genericBuilder.autoCompleteCallback != null) {
+					if (option is BaseChoiceBuilder<*, *> && arg.converter.genericBuilder.autoCompleteCallback != null) {
 						option.choices?.clear()
 					}
 
@@ -453,7 +454,7 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 							option.translate(command, arg)
 
 							if (
-								option is BaseChoiceBuilder<*> &&
+								option is BaseChoiceBuilder<*, *> &&
 								arg.converter.genericBuilder.autoCompleteCallback != null
 							) {
 								option.choices?.clear()
@@ -571,21 +572,23 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 		this.description = description
 		this.descriptionLocalizations = descriptionLocalizations
 
-		if (this is BaseChoiceBuilder<*> && !choices.isNullOrEmpty()) {
+		if (this is BaseChoiceBuilder<*, *> && !choices.isNullOrEmpty()) {
 			translate(command)
 		}
 	}
 
 	@Suppress("DEPRECATION_ERROR")
-	private fun BaseChoiceBuilder<*>.translate(command: ApplicationCommand<*>) {
-		choices = choices!!.map {
+	private fun <A, B : Choice> BaseChoiceBuilder<A, B>.translate(command: ApplicationCommand<*>) {
+		this.choices = choices!!.map {
 			val (name, nameLocalizations) = command.localize(it.name)
 
 			when (it) {
 				is Choice.NumberChoice -> Choice.NumberChoice(name, Optional(nameLocalizations), it.value)
 				is Choice.StringChoice -> Choice.StringChoice(name, Optional(nameLocalizations), it.value)
 				is Choice.IntegerChoice -> Choice.IntegerChoice(name, Optional(nameLocalizations), it.value)
-			}
+
+				is NumericOptionBuilder<*, *> -> TODO()
+			} as B
 		}.toMutableList()
 	}
 }