Fix data collection caused by kx.ser problem

Kord-Extensions · Sep 3, 2024 · a7dea3a · a7dea3a
1 parent c227e2d
commit a7dea3a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ dokkadokka = "1.9.20"  # Note: Must update plugin versions in buildSrc/build.gra
 kotlin = "2.0.20"  # Note: Must update plugin versions in buildSrc/build.gradle.kts
 
 commons-validator = "1.9.0"
-data-collector-api = "1.0.0-SNAPSHOT"
+data-collector-api = "1.0.1-SNAPSHOT"
 groovy = "3.0.22"
 icu4j = "75.1"
 jansi = "2.4.1"

diff --git a/kord-extensions/src/main/kotlin/dev/kordex/core/datacollection/DataAPIClient.kt b/kord-extensions/src/main/kotlin/dev/kordex/core/datacollection/DataAPIClient.kt
@@ -12,7 +12,7 @@ import dev.kordex.core.annotations.InternalAPI
 import dev.kordex.data.api.DataCollection
 import dev.kordex.data.api.DataEntity
 import dev.kordex.data.api.serializers.DataCollectionSerializer
-import dev.kordex.data.api.serializers.UUIDSerializer
+import dev.kordex.data.api.serializers.KXUUIDSerializer
 import dev.kordex.data.api.types.Entity
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -43,7 +43,7 @@ public object DataAPIClient {
 						include(Json.serializersModule)
 
 						contextual<DataCollection>(DataCollectionSerializer)
-						contextual<UUID>(UUIDSerializer)
+						contextual<UUID>(KXUUIDSerializer)
 					}
 				}
 			)

diff --git a/kord-extensions/src/main/kotlin/dev/kordex/core/datacollection/State.kt b/kord-extensions/src/main/kotlin/dev/kordex/core/datacollection/State.kt
@@ -9,13 +9,13 @@
 package dev.kordex.core.datacollection
 
 import dev.kordex.core.storage.Data
-import dev.kordex.data.api.serializers.UUIDSerializer
+import dev.kordex.data.api.serializers.KXUUIDSerializer
 import kotlinx.serialization.Serializable
 import java.util.UUID
 
 @Suppress("DataClassShouldBeImmutable")
 @Serializable
 public data class State(
-	@Serializable(with = UUIDSerializer::class)
+	@Serializable(with = KXUUIDSerializer::class)
 	var uuid: UUID? = null,
 ) : Data
diff --git a/modules/functionality/func-mappings/build.gradle.kts b/modules/functionality/func-mappings/build.gradle.kts
@@ -45,7 +45,9 @@ repositories {
 }
 
 dependencies {
-	api(libs.linkie)
+	api(libs.linkie) {
+		exclude("ch.qos.logback", "logback-classic")
+	}
 
 	detektPlugins(libs.detekt)
 	detektPlugins(libs.detekt.libraries)