Now we wait on KTIJ-30021

Kord-Extensions · May 22, 2024 · a70ac1e · a70ac1e
1 parent 62b29ab
commit a70ac1e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 26 deletions.
diff --git a/...in/com/kotlindiscord/kord/extensions/modules/annotations/converters/ConverterProcessor.kt b/...in/com/kotlindiscord/kord/extensions/modules/annotations/converters/ConverterProcessor.kt
@@ -171,6 +171,7 @@ public class ConverterProcessor(
                     import com.kotlindiscord.kord.extensions.commands.Arguments
                     import com.kotlindiscord.kord.extensions.commands.converters.*
                     import com.kotlindiscord.kord.extensions.commands.converters.builders.*
+					import com.kotlindiscord.kord.extensions.utils.MutableStringKeyedMap
                     import dev.kord.common.annotation.KordPreview
                     """.trimIndent()
 				)

diff --git a/...d/kord/extensions/modules/annotations/converters/builders/ConverterBuilderClassBuilder.kt b/...d/kord/extensions/modules/annotations/converters/builders/ConverterBuilderClassBuilder.kt
@@ -187,7 +187,7 @@ public class ConverterBuilderClassBuilder : KoinComponent {
 		builder.append(" {\n")
 
 		if (ConverterType.CHOICE in types) {
-			builder.append("    override var choices: MutableMap<String, $argumentType> = mutableMapOf()\n\n")
+			builder.append("    override var choices: MutableStringKeyedMap<$argumentType> = mutableMapOf()\n\n")
 		}
 
 		builder.append("    /** @inject: builderFields **/\n")

diff --git a/kord-extensions/build.gradle.kts b/kord-extensions/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
 	repositories {
 		maven {
@@ -55,12 +53,6 @@ dependencies {
 	kspTest(project(":annotation-processor"))
 }
 
-val compileKotlin: KotlinCompile by tasks
-
-compileKotlin.kotlinOptions {
-	languageVersion = "1.7"
-}
-
 dokkaModule {
 	moduleName = "Kord Extensions"
 	includes.add("packages.md")

diff --git a/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt b/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt
@@ -578,17 +578,15 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 	}
 
 	@Suppress("DEPRECATION_ERROR")
-	private fun <A, B : Choice> BaseChoiceBuilder<A, B>.translate(command: ApplicationCommand<*>) {
+	private fun <C : Choice> BaseChoiceBuilder<*, C>.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
+			when (val c = it as Choice) {
+				is Choice.NumberChoice -> Choice.NumberChoice(name, Optional(nameLocalizations), c.value)
+				is Choice.StringChoice -> Choice.StringChoice(name, Optional(nameLocalizations), c.value)
+				is Choice.IntegerChoice -> Choice.IntegerChoice(name, Optional(nameLocalizations), c.value)
+			} as C
 		}.toMutableList()
 	}
 }
diff --git a/...s/src/main/kotlin/com/kotlindiscord/kord/extensions/sentry/captures/SentryScopeCapture.kt b/...s/src/main/kotlin/com/kotlindiscord/kord/extensions/sentry/captures/SentryScopeCapture.kt
@@ -99,7 +99,7 @@ public open class SentryScopeCapture : SentryCapture() {
 			scope.setContexts("omitted_data_types", allowedTypes.omittedData!!)
 		}
 
-		processMap(tags).forEach(scope::setTag)
+		processMap<String>(tags).forEach(scope::setTag)
 	}
 
 	/** Set the given [value] into the [tags] map under [key]. **/

diff --git a/test-bot/build.gradle.kts b/test-bot/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
 	repositories {
 		maven {
@@ -74,12 +72,6 @@ dependencies {
 	kspTest(project(":annotation-processor"))
 }
 
-val compileKotlin: KotlinCompile by tasks
-
-compileKotlin.kotlinOptions {
-	languageVersion = "1.7"
-}
-
 application {
 	this.mainClass.set("com.kotlindiscord.kord.extensions.testbot.TestBotKt")
 }