Merge pull request #316 from simple-robot/dev/main

release: v4.2.0

Author: ForteScarlet

.github/dependabot.yml

@@ -10,3 +10,12 @@ updates:
     assignees:
       - ForteScarlet
     open-pull-requests-limit: 10
+
+    ignore:
+      - dependency-name: 'io.ktor:*'
+        versions: ['3.+']
+      - dependency-name: 'io.ktor.plugin'
+        versions: ['3.+']
+      - dependency-name: 'love.forte.plugin.suspend-transform:*'
+      - dependency-name: 'love.forte.plugin.suspend-transform'
+      - dependency-name: 'org.jetbrains.dokka:*'

.github/workflows/kdoc.yml.bk

@@ -28,7 +28,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             -Porg.gradle.jvmargs="-Xmx4g -Xms4g -XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8" 
             -Porg.gradle.daemon=false

.github/workflows/publish-kdoc.yml

@@ -6,7 +6,7 @@ on:
 env:
   JAVA_VERSION: 21
   JAVA_DISTRIBUTION: zulu
-  GRADLE_VERSION: 8.5
+  GRADLE_VERSION: 8.10.2
   IS_CI: true
   GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
   GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
@@ -39,7 +39,7 @@ jobs:
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           arguments: |
-            dokkaHtmlMultiModule
+            dokkaGenerate
             --info 
             --warning-mode all
             -x test

.github/workflows/publish-release.yml

@@ -16,7 +16,7 @@ env:
   SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
   SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
   GRADLE_OPTS: "-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
-  GRADLE_VERSION: 8.5
+  GRADLE_VERSION: 8.10.2
 
 
 jobs:
@@ -39,9 +39,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
+          arguments: |
+            assemble
+            allTests
+            --stacktrace 
+            --warning-mode all 
+            -Pkotlin.native.enableKlibsCrossCompilation=false
 
-      - name: Run all tests
-        run: gradle assemble allTests --stacktrace --warning-mode all
+#      - name: Run all tests
+#        run: gradle assemble allTests --stacktrace --warning-mode all -Pkotlin.native.enableKlibsCrossCompilation=false
 
       - name: Upload test reports
         uses: actions/upload-artifact@v4
@@ -56,7 +62,7 @@ jobs:
     needs: run-test
     # 交叉编译 support
     # see https://kotlinlang.org/docs/multiplatform-publish-lib.html#host-requirements
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -136,7 +142,7 @@ jobs:
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
           arguments: |
-            dokkaHtmlMultiModule
+            dokkaGenerate
             --info 
             --warning-mode all
             -x test

.github/workflows/publish-snapshot.yml

@@ -33,7 +33,7 @@ env:
   SIMBOT_IS_SNAPSHOT: true
   SIMBOT_SNAPSHOT_ONLY: true
   GRADLE_OPTS: "-Dfile.encoding=UTF-8"
-  GRADLE_VERSION: 8.5
+  GRADLE_VERSION: 8.10.2
 
 
 jobs:
@@ -56,14 +56,20 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
+          arguments: |
+            assemble
+            allTests
+            --stacktrace 
+            --warning-mode all 
+            -Pkotlin.native.enableKlibsCrossCompilation=false
 
-      - name: Gradle run all tests
-        run: gradle assemble allTests --stacktrace --warning-mode all
+#      - name: Gradle run all tests
+#        run: gradle assemble allTests --stacktrace --warning-mode all -Pkotlin.native.enableKlibsCrossCompilation=false
 
   publish-snapshots:
     name: Publish snapshots
     needs: run-test
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -117,7 +123,7 @@ jobs:
             --warning-mode all
             -x test
             --build-cache
-            dokkaHtmlMultiModule
+            dokkaGenerate
 
       - name: Push to doc repository
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/publish-v4-release.yml.bk

@@ -40,14 +40,14 @@ jobs:
       - name: Gradle Run Test
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: assemble test -Porg.gradle.daemon=false
 
       # setup Gradle
       - name: Publish Release
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             publishToSonatype
             closeAndReleaseStagingRepositories
@@ -105,7 +105,7 @@ jobs:
       - name: Gradle publish snapshot
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             publishToSonatype
             closeAndReleaseStagingRepositories
@@ -141,7 +141,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             dokkaHtmlMultiModule
             --info 

.github/workflows/publish-v4-snapshot.yml.bk

@@ -57,7 +57,7 @@ jobs:
       - name: Gradle test and publish snapshot
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             test 
             publishToSonatype
@@ -89,7 +89,7 @@ jobs:
       - name: Gradle generate documentation
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.5
+          gradle-version: 8.8
           arguments: |
             -Porg.gradle.jvmargs="-Xmx4g -Xms4g -XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8" 
             -Porg.gradle.daemon=false

.github/workflows/test-branch.yml

@@ -33,12 +33,12 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-#          cache: 'gradle'
+          cache: 'gradle'
 
       - name: Run All Tests
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.5
+          gradle-version: 8.10.2
           arguments: |
             assemble
             build

.run/runConfigurations/dokkaGenerate.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="dokkaGenerate" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="--warning-mode all" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="dokkaGenerate" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024. ForteScarlet.
+ * Copyright (c) 2022-2025. ForteScarlet.
  *
  * This file is part of simbot-component-qq-guild.
  *
@@ -17,14 +17,16 @@
 
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.core.repository.Repositories
-
+import love.forte.plugin.suspendtrans.gradle.SuspendTransformPluginExtension
+import love.forte.simbot.gradle.suspendtransforms.addSimbotJvmTransforms
 
 plugins {
     idea
-    id("simbot-tencent-guild.changelog-generator")
-    id("simbot-tencent-guild.dokka-multi-module")
-    id("simbot-tencent-guild.nexus-publish")
+    `changelog-generator`
+    `root-dokka`
+    `nexus-publish`
     alias(libs.plugins.kotlinxBinaryCompatibilityValidator)
+    id("love.forte.plugin.suspend-transform") apply false
 }
 
 setup(P.ComponentQQGuild)
@@ -33,6 +35,10 @@ buildscript {
     repositories {
         mavenCentral()
     }
+
+//    dependencies {
+//        classpath(libs.simbot.gradle)
+//    }
 }
 
 logger.info("=== Current version: {} ===", version)
@@ -47,6 +53,19 @@ allprojects {
                 snapshotsOnly()
             }
         }
+        mavenLocal()
+    }
+}
+
+subprojects {
+    afterEvaluate {
+        if (plugins.hasPlugin(libs.plugins.suspendTransform.get().pluginId)) {
+            extensions.configure<SuspendTransformPluginExtension>("suspendTransformPlugin") {
+                includeRuntime = false
+                includeAnnotation = false
+                addSimbotJvmTransforms()
+            }
+        }
     }
 }
 
@@ -84,9 +103,42 @@ apiValidation {
             "love.forte.simbot.annotations.InternalSimbotAPI",
             "love.forte.simbot.qguild.QGInternalApi",
             "love.forte.simbot.component.qguild.ExperimentalQGApi",
-            "love.forte.simbot.qguild.ExperimentalQGMediaApi"
+            "love.forte.simbot.qguild.ExperimentalQGMediaApi",
+            "love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api"
         ),
     )
 
     apiDumpDirectory = "api"
 }
+
+//subprojects {
+//    afterEvaluate {
+//        val p = this
+//        if (plugins.hasPlugin("org.jetbrains.dokka")) {
+//            dokka {
+//                configSourceSets(p)
+//                pluginsConfiguration.html {
+//                    configHtmlCustoms(p)
+//                }
+//            }
+//            rootProject.dependencies.dokka(p)
+//        }
+//    }
+//}
+//
+//dokka {
+//    moduleName = "Simple Robot 组件 | QQ"
+//
+//    dokkaPublications.all {
+//        if (isSimbotLocal()) {
+//            logger.info("Is 'SIMBOT_LOCAL', offline")
+//            offlineMode = true
+//        }
+//    }
+//
+//    configSourceSets(project)
+//
+//    pluginsConfiguration.html {
+//        configHtmlCustoms(project)
+//    }
+//}

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024. ForteScarlet.
+ * Copyright (c) 2021-2025. ForteScarlet.
  *
  * This file is part of simbot-component-qq-guild.
  *
@@ -32,7 +32,8 @@ dependencies {
     implementation(kotlin("serialization", kotlinVersion))
     // for plugin.spring
     implementation(kotlin("allopen", kotlinVersion))
-    implementation(libs.bundles.dokka)
+    implementation(libs.dokka.plugin)
+//    implementation(libs.bundles.dokka)
 
     // see https://github.com/gradle-nexus/publish-plugin
     implementation("io.github.gradle-nexus:publish-plugin:2.0.0")