bump(deps): Kotlin from 2.0.10 to 2.0.20

simple-robot · Oct 8, 2024 · 3d0773e · 3d0773e
1 parent af72957
commit 3d0773e
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 132 deletions.
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/simbot-api/build.gradle.kts b/simbot-api/build.gradle.kts
@@ -26,7 +26,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.time.Instant
 
 plugins {
@@ -58,7 +57,7 @@ kotlin {
     applyTier3()
 
     // wasm?
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/...c/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt b/...c/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt
@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      [email protected]
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -36,8 +36,13 @@ internal actual fun ioDispatcher(): CoroutineDispatcher? = Dispatchers.IO
 /**
  * 获取自定义调度器。
  *
- * native 平台下 [maxThreads] 和 [keepAliveMillis] 无效
+ * 基于 [Dispatchers.IO]，
+ * 使用 [CoroutineDispatcher.limitedParallelism]。
  *
+ * native 平台下 [maxThreads] 和 [keepAliveMillis] 无效。
+ *
+ * @see CoroutineDispatcher.limitedParallelism
+ * @see newFixedThreadPoolContext
  */
 internal actual fun customDispatcher(
     coreThreads: Int?,
@@ -48,7 +53,8 @@ internal actual fun customDispatcher(
     val core = coreThreads ?: return null
     require(core <= 1) { "'coreThreads' must >= 1, but $core" }
 
-    return newFixedThreadPoolContext(core, name ?: "Custom-DP.FT.$core")
+    return Dispatchers.IO.limitedParallelism(core, name ?: "Custom-DP.FT.$core")
+    // return newFixedThreadPoolContext(core, name ?: "Custom-DP.FT.$core")
 }
 
 /**

diff --git a/simbot-commons/simbot-common-annotations/build.gradle.kts b/simbot-commons/simbot-common-annotations/build.gradle.kts
@@ -24,7 +24,6 @@
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -49,7 +48,7 @@ kotlin {
     applyTier3()
 
     // wasm
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-commons/simbot-common-atomic/build.gradle.kts b/simbot-commons/simbot-common-atomic/build.gradle.kts
@@ -25,7 +25,7 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")

diff --git a/simbot-commons/simbot-common-collection/build.gradle.kts b/simbot-commons/simbot-common-collection/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -52,7 +51,7 @@ kotlin {
     applyTier3()
 
     // wasm?
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-commons/simbot-common-core/build.gradle.kts b/simbot-commons/simbot-common-core/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -51,7 +50,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-commons/simbot-common-stage-loop/build.gradle.kts b/simbot-commons/simbot-common-stage-loop/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 
 plugins {
@@ -51,7 +50,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-commons/simbot-common-streamable/build.gradle.kts b/simbot-commons/simbot-common-streamable/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -50,7 +49,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-commons/simbot-common-suspend-runner/build.gradle.kts b/simbot-commons/simbot-common-suspend-runner/build.gradle.kts
@@ -24,7 +24,6 @@
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -48,7 +47,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-cores/simbot-core/build.gradle.kts b/simbot-cores/simbot-core/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -52,7 +51,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-extensions/simbot-extension-continuous-session/build.gradle.kts b/simbot-extensions/simbot-extension-continuous-session/build.gradle.kts
@@ -24,7 +24,6 @@
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -49,7 +48,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-logger/build.gradle.kts b/simbot-logger/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (c) 2023 ForteScarlet.
@@ -63,7 +62,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-quantcat/simbot-quantcat-common/build.gradle.kts b/simbot-quantcat/simbot-quantcat-common/build.gradle.kts
@@ -26,7 +26,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /*
  * Copyright (c) 2023 ForteScarlet.
@@ -65,7 +64,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }

diff --git a/simbot-test/build.gradle.kts b/simbot-test/build.gradle.kts
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -54,7 +53,7 @@ kotlin {
     applyTier2()
     applyTier3()
 
-    @OptIn(ExperimentalWasmDsl::class)
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         configWasmJs()
     }