simple-robot · ForteScarlet · Oct 31, 2024 · Aug 19, 2024 · Aug 19, 2024 · Aug 26, 2024
diff --git a/.changelog/v0.0.12.md b/.changelog/v0.0.12.md
@@ -0,0 +1,7 @@
+> 对应核心版本: [**v4.7.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.7.0)
+
+
+我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-telegram/issues)或[协助](https://github.com/simple-robot/simbot-component-telegram/pulls)，
+感谢您的贡献与支持！
+
+也欢迎您为我们献上一颗 `star`，这是对我们最大的鼓励与认可！
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
@@ -1,7 +1,7 @@
 name: Qodana
 on:
   workflow_dispatch:
-  pull_request:
+  pull_request_target:
   push:
     branches:
       - dev/main

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.run/runConfigurations/simbot-component-telegram [detekt].run.xml b/.run/runConfigurations/simbot-component-telegram [detekt].run.xml
@@ -21,4 +21,26 @@
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
+  <configuration default="false" name="simbot-component-telegram [detekt]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="detekt" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
 </component>
diff --git a/buildSrc/src/main/kotlin/JsConfig.kt b/buildSrc/src/main/kotlin/JsConfig.kt
@@ -16,39 +16,22 @@
  */
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.the
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 
 
 inline fun KotlinJsTargetDsl.configJs(
     nodeJs: Boolean = true,
-    browser: Boolean = true,
     block: () -> Unit = {}
 ) {
     if (nodeJs) {
-        nodejs()
-//        {
-////            testTask {
-////                useMocha {
-////                    timeout = "10000"
-////                }
-////            }
-//        }
-    }
-
-    if (browser) {
-        browser()
-//        {
-//            testTask{
-//                useKarma {
-//                    useChromeHeadless()
-//                    // useConfigDirectory(File(project.rootProject.projectDir, "karma"))
-//                }
-//            }
-//        }
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "10000"
+                }
+            }
+        }
     }
 
     binaries.library()
@@ -59,30 +42,24 @@ inline fun KotlinJsTargetDsl.configJs(
 fun Project.configJsTestTasks() {
     // val shouldRunJsBrowserTest = !hasProperty("teamcity") || hasProperty("enable-js-tests")
     // if (shouldRunJsBrowserTest) return
-    tasks.findByName("cleanJsBrowserTest")?.apply {
-        onlyIf { false }
-    }
-    tasks.findByName("jsBrowserTest")?.apply {
-        onlyIf { false }
-    }
+    // tasks.findByName("cleanJsBrowserTest")?.apply {
+    //     onlyIf { false }
+    // }
+    // tasks.findByName("jsBrowserTest")?.apply {
+    //     onlyIf { false }
+    // }
 }
 
 inline fun KotlinWasmJsTargetDsl.configWasmJs(
     nodeJs: Boolean = true,
-    browser: Boolean = true,
     block: () -> Unit = {}
 ) {
     if (nodeJs && isLinux) {
         // win in candy node `21.0.0-v8-canary202309143a48826a08` is not supported
-        // nodejs()
-    }
-
-    if (browser) {
-        browser {
-            testTask{
-                useKarma {
-                    useChromeHeadless()
-                    // useConfigDirectory(File(project.rootProject.projectDir, "karma"))
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "10000"
                 }
             }
         }
@@ -93,18 +70,17 @@ inline fun KotlinWasmJsTargetDsl.configWasmJs(
 }
 
 inline fun Project.configWasmJsTest(block: () -> Unit = {}) {
-    if (false) {
-        // see https://youtrack.jetbrains.com/issue/KT-63014/Running-tests-with-wasmJs-in-1.9.20-requires-Chrome-Canary#focus=Comments-27-8321383.0-0
-        rootProject.the<NodeJsRootExtension>().apply {
-            // nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-            version = "21.0.0-v8-canary202309143a48826a08"
-            downloadBaseUrl = "https://nodejs.org/download/v8-canary"
-        }
-
-        tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-            args.add("--ignore-engines")
-        }
-    }
-
+    // if (false) {
+    //     // see https://youtrack.jetbrains.com/issue/KT-63014/Running-tests-with-wasmJs-in-1.9.20-requires-Chrome-Canary#focus=Comments-27-8321383.0-0
+    //     rootProject.the<NodeJsRootExtension>().apply {
+    //         // nodeVersion = "21.0.0-v8-canary202309143a48826a08"
+    //         version = "21.0.0-v8-canary202309143a48826a08"
+    //         downloadBaseUrl = "https://nodejs.org/download/v8-canary"
+    //     }
+    //
+    //     tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
+    //         args.add("--ignore-engines")
+    //     }
+    // }
     block()
 }
diff --git a/buildSrc/src/main/kotlin/K2Config.kt b/buildSrc/src/main/kotlin/K2Config.kt
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -40,8 +40,8 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
-        const val VERSION = "0.0.11"
-        const val NEXT_VERSION = "0.0.12"
+        const val VERSION = "0.0.12"
+        const val NEXT_VERSION = "0.0.13"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
 [versions]
-kotlin = "2.0.10"
-kotlinx-coroutines = "1.8.1"
-kotlinx-serialization = "1.7.1"
-kotlinx-datetime = "0.6.0"
+kotlin = "2.0.20"
+kotlinx-coroutines = "1.9.0"
+kotlinx-serialization = "1.7.3"
+kotlinx-datetime = "0.6.1"
+kotlinx-io = "0.5.4"
 dokka = "1.9.20"
-okio = "3.3.0"
 ktor = "2.3.12"
 openjdk-jmh = "1.37"
-log4j = "2.23.1"
-reactor = "3.6.2"
+log4j = "2.24.1"
+reactor = "3.6.11"
 # simbot
-simbot = "4.6.0"
-suspendTransform = "0.9.0"
+simbot = "4.7.0"
+suspendTransform = "2.0.20-0.9.3"
 gradleCommon = "0.6.0"
 # ksp
-ksp = "2.0.10-1.0.24"
+ksp = "2.0.20-1.0.25"
 # https://square.github.io/kotlinpoet/
-kotlinPoet = "1.18.1"
+kotlinPoet = "2.0.0"
 # https://mockk.io/
-mockk = "1.13.12"
+mockk = "1.13.13"
 # https://detekt.dev/docs/intro
-detekt = "1.23.6"
+detekt = "1.23.7"
 
 [libraries]
 # simbot
@@ -39,7 +39,7 @@ simbot-common-ktor-inputfile = { group = "love.forte.simbot.common", name = "sim
 simbot-gradle = { group = "love.forte.simbot.gradle", name = "simbot-gradle-suspendtransforms", version.ref = "simbot" }
 
 # jetbrains-annotation
-jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
+jetbrains-annotations = "org.jetbrains:annotations:26.0.1"
 
 # kotlinx-coroutines
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -65,6 +65,9 @@ kotlinx-serialization-properties = { group = "org.jetbrains.kotlinx", name = "ko
 # kotlinx-datetime
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 
+# kotlinx-io
+kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" }
+
 # ktor
 ktor-serialization-kotlinxJson = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-server-contentNegotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Feb 25 20:12:01 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists