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

release: v1.8.2

Author: ForteScarlet

.github/workflows/deploy-website.yml

@@ -52,7 +52,7 @@ jobs:
           docker-version: ${{ env.DOCKER_VERSION }}
 
       - name: Upload documentation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: |
@@ -62,7 +62,7 @@ jobs:
 
       # Add the step below to upload Algolia indexes
       - name: Upload algolia-indexes
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: algolia-indexes
           path: artifacts/${{ env.ALGOLIA_ARTIFACT }}
@@ -84,7 +84,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: docs
           path: artifacts
@@ -103,24 +103,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docs
 
       - name: Unzip artifact
         run: unzip -O UTF-8 -qq ${{ env.ARTIFACT }} -d dir
 
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v4
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: dir
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4
 
   # https://www.jetbrains.com/help/writerside/configure-search.html
 #  publish-indexes:

.github/workflows/publish-kdoc.yml

@@ -6,13 +6,8 @@ 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 }}
-  GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
   GRADLE_OPTS: "-XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8"
 
 jobs:
@@ -31,17 +26,17 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION }}
           java-version: ${{ env.JAVA_VERSION }}
 
-      - name: Generate documentation
-        uses: gradle/actions/setup-gradle@v3
+      # setup Gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: |
-            dokkaGenerate 
-            --info 
-            --warning-mode all 
-            -x test 
-            --build-cache 
-            -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 
+
+      - name: Generate documentation
+        run: gradle dokkaGenerate -i --warning-mode all -x test --build-cache
+        env:
+          ORG_GRADLE_PROJECT_org.gradle.daemon: false
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-Xmx4g -Xms4g -XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8"
 
       - name: Push to doc repository
         uses: peaceiris/actions-gh-pages@v3
@@ -52,4 +47,3 @@ jobs:
           publish_dir: ./build/dokka/html
           # deploy to sub dir
           destination_dir: components/onebot
-

.github/workflows/publish-release.yml

@@ -2,54 +2,49 @@ name: Publish Release
 on:
   push:
     tags:
-      - v**
+      - 'v**'
+
+concurrency:
+  cancel-in-progress: true
+  group: publish-release-${{ github.ref_name }}
 
 env:
   JAVA_VERSION: 21
   JAVA_DISTRIBUTION: zulu
+  GRADLE_VERSION: 8.10.2
   IS_CI: true
-  GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-  GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-  GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-  OSSRH_USER: ${{ secrets.SONATYPE_USERNAME }}
-  OSSRH_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+  SIGNING_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+  GPG_KEY_CONTENTS: ${{ secrets.GPG_SECRET_KEY }}
+  SIGNING_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+  MAVEN_CENTRAL_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
+  MAVEN_CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
   GRADLE_OPTS: "-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
-  GRADLE_VERSION: 8.5
 
 jobs:
   run-test:
-    name: Run all tests
+    name: Run all tests for publish
     strategy:
       matrix:
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      # 检出仓库代码
       - uses: actions/checkout@v4
-      # setup Java
-      - name: Setup Java
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION }}
           java-version: ${{ env.JAVA_VERSION }}
           cache: 'gradle'
+
       # setup Gradle
-      # https://github.com/gradle/actions/blob/main/docs/setup-gradle.md
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         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 -Pkotlin.native.enableKlibsCrossCompilation=false
+      - name: Gradle Run Test
+        run: gradle assemble allTests -s --warning-mode all
+        env:
+          ORG_GRADLE_PROJECT_kotlin.native.enableKlibsCrossCompilation: false
 
   publish-releases:
     name: Publish releases
@@ -58,31 +53,28 @@ jobs:
     # see https://kotlinlang.org/docs/multiplatform-publish-lib.html#host-requirements
     runs-on: ubuntu-latest
     steps:
-      # 检出仓库代码
       - uses: actions/checkout@v4
-      # setup Java
       - uses: actions/setup-java@v4
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION }}
           java-version: ${{ env.JAVA_VERSION }}
           cache: 'gradle'
-
-      # setup Gradle
-      - name: Publish releases
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: |
-            publishToSonatype 
-            closeAndReleaseStagingRepositories 
-            --info 
-            --warning-mode all 
-            -x test 
-            --build-cache 
-            -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
+
+      - name: Publish releases
+        run: gradle publishToMavenCentral -i --warning-mode all --no-configuration-cache -x test
         env:
           SIMBOT_IS_SNAPSHOT: false
           SIMBOT_RELEASES_ONLY: true
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ env.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ env.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ env.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ env.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ env.GPG_KEY_CONTENTS }}
 
   create-release:
     name: Create release
@@ -92,58 +84,56 @@ jobs:
       contents: write
     steps:
       # 检出仓库代码
-      - uses: actions/checkout@v4
-      # setup Java
-      - uses: actions/setup-java@v4
-        with:
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
-          java-version: ${{ env.JAVA_VERSION }}
-          cache: 'gradle'
+      - name: Check Out Repo
+        uses: actions/checkout@v4
 
-      # setup Gradle
-      - name: Publish releases
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: createChangelog
+
+      - name: Create changelog file
+        run: gradle createChangelog -i
 
         # Create gitHub release
       - name: Create Github Release
         uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.PUSH_TOKEN }}
-          body: '${{ github.ref_name }}'
           body_path: .changelog/${{ github.ref_name }}.md
+          body: ''
           generate_release_notes: true
-          prerelease: ${{ contains(github.ref_name, 'preview') || contains(github.ref_name, 'alpha') }}
+          prerelease: ${{ contains(github.ref_name, 'preview') || contains(github.ref_name, 'alpha') || contains(github.ref_name, 'dev') }}
 
   deploy-doc:
-    name: Deploy KDoc
+    name: Deploy-doc
     runs-on: ubuntu-latest
     needs: publish-releases
     steps:
       # 检出仓库代码
-      - uses: actions/checkout@v4
+      - name: Check out repo
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
       # setup Java
-      - uses: actions/setup-java@v4
+      - name: Setup java
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION }}
           java-version: ${{ env.JAVA_VERSION }}
 
-      - name: Generate documentation
-        uses: gradle/actions/setup-gradle@v3
+      # setup Gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: |
-            dokkaGenerate 
-            --info 
-            --warning-mode all 
-            -x test 
-            --build-cache 
-            -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 
+
+      - name: Gradle generate documentation
+        run: gradle dokkaGenerate -i --warning-mode all -x test --build-cache
+        env:
+          ORG_GRADLE_PROJECT_org.gradle.daemon: false
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-Xmx4g -Xms4g -XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8"
 
       - name: Push to doc repository
         uses: peaceiris/actions-gh-pages@v3