diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c48aa985..6d287d1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlinx-coroutines = "1.7.0" -kotlinx-serialization = "1.5.0" +kotlinx-coroutines = "1.7.3" +kotlinx-serialization = "1.6.2" spring-boot = "2.7.5" openjdk-jmh = "1.35" forte-di = "0.0.3" diff --git a/simbot-component-kook-api/build.gradle.kts b/simbot-component-kook-api/build.gradle.kts index de0659f2..2f929644 100644 --- a/simbot-component-kook-api/build.gradle.kts +++ b/simbot-component-kook-api/build.gradle.kts @@ -77,7 +77,7 @@ kotlin { // Tier 2 linuxX64() - linuxArm64() +// linuxArm64() watchosSimulatorArm64() watchosX64() watchosArm32() diff --git a/simbot-component-kook-stdlib/build.gradle.kts b/simbot-component-kook-stdlib/build.gradle.kts index e7f3e45e..a329088f 100644 --- a/simbot-component-kook-stdlib/build.gradle.kts +++ b/simbot-component-kook-stdlib/build.gradle.kts @@ -78,7 +78,7 @@ kotlin { // Tier 2 linuxX64() - linuxArm64() +// linuxArm64() watchosSimulatorArm64() watchosX64() watchosArm32() @@ -98,11 +98,13 @@ kotlin { sourceSets { commonMain.dependencies { + compileOnly(simbotUtilAnnotations) api(project(":simbot-component-kook-api")) api(simbotLogger) api(simbotUtilLoop) api(simbotUtilSuspendTransformer) - compileOnly(simbotUtilAnnotations) + api(libs.ktor.serialization.kotlinx.json) + api(libs.kotlinx.serialization.json) api(libs.kotlinx.coroutines.core) api(libs.ktor.client.ws) api("org.jetbrains.kotlinx:atomicfu:${libs.versions.atomicfu.get()}") @@ -138,15 +140,3 @@ atomicfu { jvmVariant = "FU" } - -// suppress all? -//tasks.withType().configureEach { -// dokkaSourceSets.configureEach { -// suppress.set(true) -// perPackageOption { -// suppress.set(true) -// } -// } -//} - - diff --git a/simbot-component-kook-stdlib/src/commonMain/kotlin/love/forte/simbot/kook/BotConfiguration.kt b/simbot-component-kook-stdlib/src/commonMain/kotlin/love/forte/simbot/kook/BotConfiguration.kt index fa526222..905512eb 100644 --- a/simbot-component-kook-stdlib/src/commonMain/kotlin/love/forte/simbot/kook/BotConfiguration.kt +++ b/simbot-component-kook-stdlib/src/commonMain/kotlin/love/forte/simbot/kook/BotConfiguration.kt @@ -95,7 +95,7 @@ public class BotConfiguration { * 针对 [HttpClientEngineConfig] 中的通用默认属性的配置。 * */ - @Serializable + @kotlinx.serialization.Serializable public data class EngineConfiguration( /** * 参考 [HttpClientEngineConfig.threadsCount][io.ktor.client.engine.HttpClientEngineConfig.threadsCount]