Skip to content

Commit 3d0773e

Browse files
ForteScarletForteScarlet
committed
bump(deps): Kotlin from 2.0.10 to 2.0.20
1 parent af72957 commit 3d0773e

File tree

15 files changed

+109
-132
lines changed

15 files changed

+109
-132
lines changed

‎kotlin-js-store/yarn.lock

Lines changed: 87 additions & 104 deletions
Large diffs are not rendered by default.

‎simbot-api/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2727
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2828
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
29-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
3029
import java.time.Instant
3130

3231
plugins {
@@ -58,7 +57,7 @@ kotlin {
5857
applyTier3()
5958

6059
// wasm?
61-
@OptIn(ExperimentalWasmDsl::class)
60+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
6261
wasmJs {
6362
configWasmJs()
6463
}

‎simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Project https://github.com/simple-robot/simpler-robot
55
* Email [email protected]
66
*
7-
* This file is part of the Simple Robot Library.
7+
* This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
88
*
99
* This program is free software: you can redistribute it and/or modify
1010
* 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
3636
/**
3737
* 获取自定义调度器。
3838
*
39-
* native 平台下 [maxThreads] 和 [keepAliveMillis] 无效
39+
* 基于 [Dispatchers.IO]，
40+
* 使用 [CoroutineDispatcher.limitedParallelism]。
4041
*
42+
* native 平台下 [maxThreads] 和 [keepAliveMillis] 无效。
43+
*
44+
* @see CoroutineDispatcher.limitedParallelism
45+
* @see newFixedThreadPoolContext
4146
*/
4247
internal actual fun customDispatcher(
4348
coreThreads: Int?,
@@ -48,7 +53,8 @@ internal actual fun customDispatcher(
4853
val core = coreThreads ?: return null
4954
require(core <= 1) { "'coreThreads' must >= 1, but $core" }
5055

51-
return newFixedThreadPoolContext(core, name ?: "Custom-DP.FT.$core")
56+
return Dispatchers.IO.limitedParallelism(core, name ?: "Custom-DP.FT.$core")
57+
// return newFixedThreadPoolContext(core, name ?: "Custom-DP.FT.$core")
5258
}
5359

5460
/**

‎simbot-commons/simbot-common-annotations/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
27-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2827

2928
plugins {
3029
kotlin("multiplatform")
@@ -49,7 +48,7 @@ kotlin {
4948
applyTier3()
5049

5150
// wasm
52-
@OptIn(ExperimentalWasmDsl::class)
51+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5352
wasmJs {
5453
configWasmJs()
5554
}

‎simbot-commons/simbot-common-atomic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
28+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2929

3030
plugins {
3131
kotlin("multiplatform")

‎simbot-commons/simbot-common-collection/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
plugins {
3130
kotlin("multiplatform")
@@ -52,7 +51,7 @@ kotlin {
5251
applyTier3()
5352

5453
// wasm?
55-
@OptIn(ExperimentalWasmDsl::class)
54+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5655
wasmJs {
5756
configWasmJs()
5857
}

‎simbot-commons/simbot-common-core/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
plugins {
3130
kotlin("multiplatform")
@@ -51,7 +50,7 @@ kotlin {
5150
applyTier2()
5251
applyTier3()
5352

54-
@OptIn(ExperimentalWasmDsl::class)
53+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5554
wasmJs {
5655
configWasmJs()
5756
}

‎simbot-commons/simbot-common-stage-loop/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029

3130
plugins {
@@ -51,7 +50,7 @@ kotlin {
5150
applyTier2()
5251
applyTier3()
5352

54-
@OptIn(ExperimentalWasmDsl::class)
53+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5554
wasmJs {
5655
configWasmJs()
5756
}

‎simbot-commons/simbot-common-streamable/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
plugins {
3130
kotlin("multiplatform")
@@ -50,7 +49,7 @@ kotlin {
5049
applyTier2()
5150
applyTier3()
5251

53-
@OptIn(ExperimentalWasmDsl::class)
52+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5453
wasmJs {
5554
configWasmJs()
5655
}

‎simbot-commons/simbot-common-suspend-runner/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
27-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2827

2928
plugins {
3029
kotlin("multiplatform")
@@ -48,7 +47,7 @@ kotlin {
4847
applyTier2()
4948
applyTier3()
5049

51-
@OptIn(ExperimentalWasmDsl::class)
50+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5251
wasmJs {
5352
configWasmJs()
5453
}

‎simbot-cores/simbot-core/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
plugins {
3130
kotlin("multiplatform")
@@ -52,7 +51,7 @@ kotlin {
5251
applyTier2()
5352
applyTier3()
5453

55-
@OptIn(ExperimentalWasmDsl::class)
54+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5655
wasmJs {
5756
configWasmJs()
5857
}

‎simbot-extensions/simbot-extension-continuous-session/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
27-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2827

2928
plugins {
3029
kotlin("multiplatform")
@@ -49,7 +48,7 @@ kotlin {
4948
applyTier2()
5049
applyTier3()
5150

52-
@OptIn(ExperimentalWasmDsl::class)
51+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5352
wasmJs {
5453
configWasmJs()
5554
}

‎simbot-logger/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
/*
3130
* Copyright (c) 2023 ForteScarlet.
@@ -63,7 +62,7 @@ kotlin {
6362
applyTier2()
6463
applyTier3()
6564

66-
@OptIn(ExperimentalWasmDsl::class)
65+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
6766
wasmJs {
6867
configWasmJs()
6968
}

‎simbot-quantcat/simbot-quantcat-common/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2727
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2828
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
29-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
3029

3130
/*
3231
* Copyright (c) 2023 ForteScarlet.
@@ -65,7 +64,7 @@ kotlin {
6564
applyTier2()
6665
applyTier3()
6766

68-
@OptIn(ExperimentalWasmDsl::class)
67+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
6968
wasmJs {
7069
configWasmJs()
7170
}

‎simbot-test/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
2525
import love.forte.gradle.common.kotlin.multiplatform.applyTier2
2626
import love.forte.gradle.common.kotlin.multiplatform.applyTier3
2727
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
28-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2928

3029
plugins {
3130
kotlin("multiplatform")
@@ -54,7 +53,7 @@ kotlin {
5453
applyTier2()
5554
applyTier3()
5655

57-
@OptIn(ExperimentalWasmDsl::class)
56+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
5857
wasmJs {
5958
configWasmJs()
6059
}

0 commit comments

Comments
 (0)