Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(deps): Kotlin from 2.0.10 to 2.0.20 #945

Merged
merged 2 commits into from
Oct 8, 2024
Merged

bump(deps): Kotlin from 2.0.10 to 2.0.20 #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af72957
bump(deps): Kotlin from 2.0.10 to 2.0.20
ForteScarlet Oct 8, 2024
3d0773e
bump(deps): Kotlin from 2.0.10 to 2.0.20
ForteScarlet Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "2.0.10"
kotlin = "2.0.20"
dokka = "1.9.20"
kotlinx-coroutines = "1.9.0"
kotlinx-serialization = "1.7.1"
Expand All @@ -10,15 +10,14 @@ ktor = "2.3.12"
slf4j = "2.0.16"
# https://kotlinlang.org/docs/ksp-quickstart.html
# https://github.com/google/ksp
ksp = "2.0.10-1.0.24"
ksp = "2.0.20-1.0.25"
# https://square.github.io/kotlinpoet/
kotlinPoet = "1.18.1"
# https://github.com/Kotlin/kotlinx-benchmark
#kotlinxBenchmark = "0.4.11"
reactor = "3.6.10"
# simbots
suspendTransform = "0.9.0"
suspendReversal = "0.2.0"
suspendTransform = "2.0.20-0.9.3"
gradleCommon = "0.6.0"
# tests
mockk = "1.13.12"
Expand Down Expand Up @@ -114,10 +113,6 @@ ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref =
# https://kotlinlang.org/docs/lincheck-guide.html#associate-compiler-tasks
kotlinx-lincheck = "org.jetbrains.kotlinx:lincheck:2.34"

# https://github.com/ForteScarlet/kotlin-suspend-interface-reversal
suspend-reversal-annotations = { module = "love.forte.suspend-interface-reversal:annotations", version.ref = "suspendReversal" }
suspend-reversal-processor = { module = "love.forte.suspend-interface-reversal:processor", version.ref = "suspendReversal" }

ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
# https://square.github.io/kotlinpoet/interop-ksp/
kotlinPoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinPoet" }
Expand Down
191 changes: 87 additions & 104 deletions kotlin-js-store/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions simbot-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -58,7 +57,7 @@ kotlin {
applyTier3()

// wasm?
@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
12 changes: 9 additions & 3 deletions ...c/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,15 +29,20 @@
import kotlinx.coroutines.newFixedThreadPoolContext

/**
* 获取 [Dispatchers.IO] 调度器。

Check warning on line 32 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'IO'
*/
internal actual fun ioDispatcher(): CoroutineDispatcher? = Dispatchers.IO

/**
* 获取自定义调度器。
*
* native 平台下 [maxThreads] 和 [keepAliveMillis] 无效
* 基于 [Dispatchers.IO]，

Check warning on line 39 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'Dispatchers'
* 使用 [CoroutineDispatcher.limitedParallelism]。

Check warning on line 40 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'CoroutineDispatcher'

Check warning on line 40 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'limitedParallelism'
*
* native 平台下 [maxThreads] 和 [keepAliveMillis] 无效。
*
* @see CoroutineDispatcher.limitedParallelism

Check warning on line 44 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'limitedParallelism'

Check warning on line 44 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'CoroutineDispatcher'
* @see newFixedThreadPoolContext

Check warning on line 45 in simbot-api/src/nativeMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.native.kt

View workflow job for this annotation

GitHub Actions / qodana

Unresolved reference in KDoc 

Cannot resolve symbol 'newFixedThreadPoolContext'
*/
internal actual fun customDispatcher(
coreThreads: Int?,
Expand All @@ -48,7 +53,8 @@
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")
}

/**
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -49,7 +48,7 @@ kotlin {
applyTier3()

// wasm
@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
2 changes: 1 addition & 1 deletion simbot-commons/simbot-common-atomic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-collection/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -52,7 +51,7 @@ kotlin {
applyTier3()

// wasm?
@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -51,7 +50,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-stage-loop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -51,7 +50,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-streamable/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -50,7 +49,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-commons/simbot-common-suspend-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -48,7 +47,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-cores/simbot-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -52,7 +51,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-extensions/simbot-extension-continuous-session/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -49,7 +48,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-logger/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -63,7 +62,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-quantcat/simbot-quantcat-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -65,7 +64,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
3 changes: 1 addition & 2 deletions simbot-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -54,7 +53,7 @@ kotlin {
applyTier2()
applyTier3()

@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
configWasmJs()
}
Expand Down
2 changes: 1 addition & 1 deletion website
Open in desktop
Submodule website updated 8 files
+19 −2 Writerside/topics/FAQ.md
+2 −0 Writerside/topics/component-discord.md
+1 −1 Writerside/topics/component-qq-guild-ApiPermission.md
+3 −3 Writerside/topics/component-qq-guild-QGForum.md
+206 −4 Writerside/topics/component-qq-guild-bot-config.md
+2 −2 Writerside/topics/component-qq-guild.md
+286 −1 Writerside/topics/component-telegram-bot-config.md
+2 −0 Writerside/topics/component-telegram.md
Loading