Merge pull request #954 from simple-robot/v4-dev

Release: v4.6.1
simple-robot · Oct 12, 2024 · 4e5a6cb · 4e5a6cb
2 parents 61361be + d2538b8
commit 4e5a6cb
Show file tree

Hide file tree

Showing 39 changed files with 544 additions and 1,842 deletions.
diff --git a/.changelog/v4.6.1.md b/.changelog/v4.6.1.md
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:
       - v4-dev
@@ -19,27 +19,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
           fetch-depth: 0  # a full history is required for pull request analysis
-#      - uses: actions/setup-java@v4
-#        with:
-#          distribution: 'zulu'
-#          java-version: 21
-#          cache: 'gradle'
-#
-#      - name: Run Kover for report
-#        uses: gradle/gradle-build-action@v3
-#        with:
-#          gradle-version: 8.5
-#          arguments: |
-#            koverHtmlReport
-#            --info
-#            --warning-mode all
-#
-#      - name: Archive coverage data # Archive data for using by Qodana
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: coverage-reports
-#          path: 'build/reports/kover/**'
-
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@main
         with:

diff --git a/.simbot/jetbrains.svg b/.simbot/jetbrains.svg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,28 @@
+# v4.6.1
+
+> Release & Pull Notes: [v4.6.1](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.1) 
+
+- feat(common-core): 增加 UUID 对 `kotlin.uuid.Uuid` 的兼容API ([`7f859de66`](https://github.com/simple-robot/simpler-robot/commit/7f859de66))
+- build(deps): bump kotlinx-serialization from 1.7.1 to 1.7.3 ([`a4b9f6a2a`](https://github.com/simple-robot/simpler-robot/commit/a4b9f6a2a))
+- build(deps): bump io.mockk:mockk from 1.13.12 to 1.13.13 ([`6f1fb1b1a`](https://github.com/simple-robot/simpler-robot/commit/6f1fb1b1a))
+- build(deps): bump org.jetbrains:annotations from 25.0.0 to 26.0.0 ([`389ed9fc2`](https://github.com/simple-robot/simpler-robot/commit/389ed9fc2))
+- bump(deps): Jetbrains annotation from 24.1.0 to 25.0.0 ([`50b57d674`](https://github.com/simple-robot/simpler-robot/commit/50b57d674))
+- bump(deps): Kotlin from 2.0.10 to 2.0.20 ([`3d0773e94..af72957f0`](https://github.com/simple-robot/simpler-robot/compare/3d0773e94..c40efb8e0))
+
+    <details><summary><code>3d0773e94..af72957f0</code></summary>
+
+    - [`3d0773e94`](https://github.com/simple-robot/simpler-robot/commit/3d0773e94)
+    - [`af72957f0`](https://github.com/simple-robot/simpler-robot/commit/af72957f0)
+
+    </details>
+
+- build(deps): bump com.github.gmazzo.buildconfig from 5.4.0 to 5.5.0 ([`c40efb8e0`](https://github.com/simple-robot/simpler-robot/commit/c40efb8e0))
+- build(deps): bump kotlinx-coroutines from 1.8.1 to 1.9.0 ([`55e62299d`](https://github.com/simple-robot/simpler-robot/commit/55e62299d))
+- build(deps): bump io.projectreactor:reactor-core from 3.6.9 to 3.6.10 ([`0835dafe7`](https://github.com/simple-robot/simpler-robot/commit/0835dafe7))
+- build(deps): bump io.projectreactor:reactor-test from 3.6.9 to 3.6.10 ([`130f3cefc`](https://github.com/simple-robot/simpler-robot/commit/130f3cefc))
+- build(deps): bump io.gitlab.arturbosch.detekt from 1.23.6 to 1.23.7 ([`d0a714465`](https://github.com/simple-robot/simpler-robot/commit/d0a714465))
+- build(deps): bump org.jetbrains.kotlinx:lincheck from 2.33 to 2.34 ([`97bfb334a`](https://github.com/simple-robot/simpler-robot/commit/97bfb334a))
+
 # v4.6.0
 
 > Release & Pull Notes: [v4.6.0](https://github.com/simple-robot/simpler-robot/releases/tag/v4.6.0) 

diff --git a/README.md b/README.md
@@ -161,7 +161,7 @@ fun Application.registerListeners() {
 ## 特别鸣谢
 
 <a href="https://www.jetbrains.com/?from=simpler-robot">
-<img src=".simbot/jetbrains.svg" width="200" alt="jetbrains" />
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.png" width="200" alt="jetbrains" />
 </a>
 
 感谢 [Jetbrains][jetbrains] 为团队提供的免费授权，也希望大家能够支持 [Jetbrains][jetbrains] 及其产品，支持正版。

diff --git a/README_en.md b/README_en.md
@@ -119,7 +119,7 @@ Lighting up a **✨star🌟** for us is the greatest motivation and support we c
 ## Special thanks
 
 <a href="https://www.jetbrains.com/?from=simpler-robot">
-<img src=".simbot/jetbrains.svg" width="200" alt="jetbrains" />
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.png" width="200" alt="jetbrains" />
 </a>
 
 [jetbrains]: https://www.jetbrains.com/?from=simpler-robot

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ import io.gitlab.arturbosch.detekt.Detekt
 plugins {
     idea
     id("simbot.dokka-multi-module")
-    id("com.github.gmazzo.buildconfig") version "5.4.0" apply false
+    id("com.github.gmazzo.buildconfig") version "5.5.0" apply false
     alias(libs.plugins.detekt)
     id("simbot.nexus-publish")
     id("simbot.changelog-generator")

diff --git a/buildSrc/src/main/kotlin/JsConfig.kt b/buildSrc/src/main/kotlin/JsConfig.kt
@@ -21,98 +21,41 @@
  *
  */
 
-import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsNodeDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl
 
 
 inline fun KotlinJsTargetDsl.configJs(
-    nodeJs: Boolean = true,
-    browser: Boolean = true,
+    crossinline nodejs: KotlinJsNodeDsl.() -> Unit = {},
     block: () -> Unit = {}
 ) {
-    if (nodeJs) {
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "50000"
-                }
-            }
-        }
-    }
-
-    if (browser) {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
+    nodejs {
+        testTask {
+            useMocha {
+                timeout = "30s"
             }
         }
+        nodejs()
     }
 
     binaries.library()
     block()
 }
 
-
-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 }
-    }
-}
-
 inline fun KotlinWasmJsTargetDsl.configWasmJs(
-    nodeJs: Boolean = true,
-    browser: Boolean = true,
+    crossinline nodejs: KotlinJsNodeDsl.() -> Unit = {},
     block: () -> Unit = {}
 ) {
-    if (nodeJs) {
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "50000"
-                }
-            }
-        }
-    }
-    // if (nodeJs && isLinux) {
-    // // win in candy node `21.0.0-v8-canary202309143a48826a08` is not supported
-    // nodejs()
-    // }
-
-    if (browser) {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
+    nodejs {
+        testTask {
+            useMocha {
+                timeout = "30s"
             }
         }
+        nodejs()
     }
 
     binaries.library()
     block()
 }
-
-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")
-    //     }
-    // }
-
-    block()
-}
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -46,14 +46,9 @@ fun isSnapshot(): Boolean = _isSnapshot
  */
 @Suppress("MemberVisibilityCanBePrivate")
 sealed class P(override val group: String) : ProjectDetail() {
-    /*
-    val groupProject = P::class.sealedSubclasses.mapNotNull { it.objectInstance }.associateBy { obj -> obj.group }
-            project = groupProject[p.group] ?: error("unknown project group: ${p.group}")
-
-     */
     companion object {
-        const val VERSION = "4.6.0"
-        const val NEXT_VERSION = "4.6.1"
+        const val VERSION = "4.6.1"
+        const val NEXT_VERSION = "4.6.2"
         const val SNAPSHOT_VERSION = "$VERSION-SNAPSHOT"
         const val NEXT_SNAPSHOT_VERSION = "$NEXT_VERSION-SNAPSHOT"
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,36 +1,35 @@
 [versions]
-kotlin = "2.0.10"
+kotlin = "2.0.20"
 dokka = "1.9.20"
-kotlinx-coroutines = "1.8.1"
-kotlinx-serialization = "1.7.1"
+kotlinx-coroutines = "1.9.0"
+kotlinx-serialization = "1.7.3"
 spring-boot-v2 = "2.7.18"
 spring-boot-v3 = "3.2.1"
 openjdk-jmh = "1.36"
 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.9"
+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"
+mockk = "1.13.13"
 # detekt
 # https://detekt.dev/docs/intro
-detekt = "1.23.6"
+detekt = "1.23.7"
 # https://github.com/gradle-nexus/publish-plugin
 gradleNexusPublishPlugin = "2.0.0"
 
 [libraries]
 # jetbrains-annotation
-jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
+jetbrains-annotations = "org.jetbrains:annotations:26.0.0"
 
 # gradle-nexus:publish-plugin
 gradleNexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "gradleNexusPublishPlugin" }
@@ -112,11 +111,7 @@ ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref =
 
 # Lincheck
 # https://kotlinlang.org/docs/lincheck-guide.html#associate-compiler-tasks
-kotlinx-lincheck = "org.jetbrains.kotlinx:lincheck:2.33"
-
-# 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" }
+kotlinx-lincheck = "org.jetbrains.kotlinx:lincheck:2.34"
 
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 # https://square.github.io/kotlinpoet/interop-ksp/