Merge branch 'release/v0.2.7'

aaa1115910 · May 15, 2024 · 9aec925 · 9aec925
2 parents ed981b8 + 6414d6a
commit 9aec925
Show file tree

Hide file tree

Showing 88 changed files with 1,499 additions and 1,429 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -45,18 +45,19 @@ body:
     attributes:
       label: 截图
       description: 如果可以，提交截图更有助于我们分析问题
-  - type: checkboxes
+  - type: dropdown
     id: app-version-confirm-use-latest
     validations:
       required: true
     attributes:
-      label: 该项目不确认已更新到以下所示的最新版本
+      label: 请确认已更新到以下所示的最新版本
       description: |
-        ![App Center Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Drelease)
-        ![App Center Alpha](https://img.shields.io/endpoint?url=https%3A%2F%2Fbadge.versions.bv.aaa1115910.dev%2F%3Ftype%3Dalpha)
+        ![GitHub Release Release](https://img.shields.io/github/v/release/aaa1115910/bv?display_name=release&label=release)
+        ![GitHub Release Pre-Release](https://img.shields.io/github/v/release/aaa1115910/bv?include_prereleases&display_name=release&label=alpha)
       options:
-        - label: 我已更新到最新版本
-          required: true
+        - '我正在使用旧版本'
+        - '已更新到最新 Release 版'
+        - '已更新到最新 Alpha 版'
   - type: input
     id: app-version
     validations:

diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
diff --git a/.github/workflows/alpha_build_manually_without_sign.yml b/.github/workflows/alpha_build_manually_without_sign.yml
@@ -14,14 +14,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: develop
           fetch-depth: 0
           submodules: 'true'
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -81,91 +81,91 @@ jobs:
       # upload artifacts lite-debug
 
       - name: Archive lite debug build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Lite debug build artifact
           path: app/build/outputs/apk/lite/debug/${{ env.lite_debug_info_apk_filename }}
 
       # upload artifacts lite-alpha
 
       - name: Archive lite alpha build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Lite alpha build artifact
           path: app/build/outputs/apk/lite/alpha/${{ env.lite_alpha_info_apk_filename }}
 
       - name: Archive lite alpha build mappings
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Lite alpha build mappings
           path: app/build/outputs/mapping/liteAlpha
 
       # upload artifacts default-debug
 
       - name: Archive default debug build artifacts (universal)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default debug build artifact (universal)
           path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_universal.apk
 
       - name: Archive default debug build artifacts (armeabi-v7a)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default debug build artifact (armeabi-v7a)
           path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_armeabi-v7a.apk
 
       - name: Archive default debug build artifacts (arm64-v8a)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default debug build artifact (arm64-v8a)
           path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_arm64-v8a.apk
 
       - name: Archive default debug build artifacts (x86)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default debug build artifact (x86)
           path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_x86.apk
 
       - name: Archive default debug build artifacts (x86_64)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default debug build artifact (x86_64)
           path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_x86_64.apk
 
       # upload artifacts default-alpha
 
       - name: Archive default alpha build mappings
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build mappings
           path: app/build/outputs/mapping/defaultAlpha
 
       - name: Archive default alpha build artifacts (universal)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build artifact (universal)
           path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_universal.apk
 
       - name: Archive default alpha build artifacts (armeabi-v7a)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build artifact (armeabi-v7a)
           path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_armeabi-v7a.apk
 
       - name: Archive default alpha build artifacts (arm64-v8a)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build artifact (arm64-v8a)
           path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_arm64-v8a.apk
 
       - name: Archive default alpha build artifacts (x86)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build artifact (x86)
           path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_x86.apk
 
       - name: Archive default alpha build artifacts (x86_64)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Default alpha build artifact (x86_64)
           path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_x86_64.apk
diff --git a/.github/workflows/auto_close_issues.yml b/.github/workflows/auto_close_issues.yml
@@ -0,0 +1,15 @@
+name: Check Issues
+
+on:
+  issues:
+    types: [opened]
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - if: contains(github.event.issue.body, '我正在使用旧版本' )
+        id: close-old-version
+        name: Close Issue(template)
+        uses: peter-evans/close-issue@v3
+        with:
+          comment: 请先尝试使用最新版本，如果问题依然存在再提交 issue
diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml
@@ -10,16 +10,17 @@ jobs:
     name: Build Feature Apk
     runs-on: macos-latest
     if: github.repository == 'aaa1115910/bv'
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0
           submodules: 'true'
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -37,146 +38,54 @@ jobs:
           SIGNING_PROPERTIES: ${{ secrets.SIGNING_PROPERTIES }}
         run: |
           echo ${{ secrets.SIGNING_PROPERTIES }} > encoded_signing_properties
-          base64 -d encoded_signing_properties > signing.properties
+          base64 -Dd -i encoded_signing_properties > signing.properties
 
       - name: Add jks file
         run: |
           echo ${{ secrets.SIGN_KEY }} > ./encoded_key
-          base64 -d encoded_key > key.jks
-
-      - name: Build lite apk
-        run: ./gradlew assembleLiteAlpha assembleLiteDebug
+          base64 -Dd -i encoded_key > key.jks
 
-      - name: Build default apk
+      - name: Build apk
         run: ./gradlew assembleDefaultAlpha assembleDefaultDebug
 
-      - name: Read lite alpha apk output metadata
-        id: apk-meta-lite-alpha
-        uses: juliangruber/read-file-action@v1
-        with:
-          path: app/build/outputs/apk/lite/alpha/output-metadata.json
-
-      - name: Read lite debug apk output metadata
-        id: apk-meta-lite-debug
-        uses: juliangruber/read-file-action@v1
-        with:
-          path: app/build/outputs/apk/lite/debug/output-metadata.json
-
-      - name: Read default alpha apk output metadata
-        id: apk-meta-default-alpha
+      - name: Read alpha apk output metadata
+        id: apk-meta-alpha
         uses: juliangruber/read-file-action@v1
         with:
           path: app/build/outputs/apk/default/alpha/output-metadata.json
 
-      - name: Read default debug apk output metadata
-        id: apk-meta-default-debug
+      - name: Read alpha debug apk output metadata
+        id: apk-meta-alpha-debug
         uses: juliangruber/read-file-action@v1
         with:
           path: app/build/outputs/apk/default/debug/output-metadata.json
 
-      - name: Parse lite apks info
-        id: lite-info
-        run: |
-          echo "lite_alpha_info_apk_filename=${{ fromJson(steps.apk-meta-lite-alpha.outputs.content).elements[0].outputFile }}" >> $GITHUB_ENV
-          echo "lite_debug_info_apk_filename=${{ fromJson(steps.apk-meta-lite-debug.outputs.content).elements[0].outputFile }}" >> $GITHUB_ENV
-
-      - name: Parse default apks info
-        id: default-info
+      - name: Parse apk infos
+        id: apk-infos
         run: |
-          echo "default_alpha_info_version_code=${{ fromJson(steps.apk-meta-default-alpha.outputs.content).elements[0].versionCode }}" >> $GITHUB_ENV
-          echo "default_alpha_info_version_name=${{ fromJson(steps.apk-meta-default-alpha.outputs.content).elements[0].versionName }}" >> $GITHUB_ENV
-          echo "default_debug_info_version_code=${{ fromJson(steps.apk-meta-default-debug.outputs.content).elements[0].versionCode }}" >> $GITHUB_ENV
-          echo "default_debug_info_version_name=${{ fromJson(steps.apk-meta-default-debug.outputs.content).elements[0].versionName }}" >> $GITHUB_ENV
+          echo "alpha_info_version_code=${{ fromJson(steps.apk-meta-alpha.outputs.content).elements[0].versionCode }}" >> $GITHUB_ENV
+          echo "alpha_info_version_name=${{ fromJson(steps.apk-meta-alpha.outputs.content).elements[0].versionName }}" >> $GITHUB_ENV
+          echo "alpha_debug_info_version_code=${{ fromJson(steps.apk-meta-alpha-debug.outputs.content).elements[0].versionCode }}" >> $GITHUB_ENV
+          echo "alpha_debug_info_version_name=${{ fromJson(steps.apk-meta-alpha-debug.outputs.content).elements[0].versionName }}" >> $GITHUB_ENV
 
-      # upload artifacts lite-debug
+      # upload artifacts alpha debug
 
-      - name: Archive lite debug build artifacts
-        uses: actions/upload-artifact@v3
+      - name: Archive alpha debug build artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: Lite debug build artifact
-          path: app/build/outputs/apk/lite/debug/${{ env.lite_debug_info_apk_filename }}
-
-      # upload artifacts lite-alpha
+          name: Alpha debug build artifact
+          path: app/build/outputs/apk/default/debug/BV_${{ env.alpha_debug_info_version_code }}_${{ env.alpha_debug_info_version_name }}_default_universal.apk
 
-      - name: Archive lite alpha build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Lite alpha build artifact
-          path: app/build/outputs/apk/lite/alpha/${{ env.lite_alpha_info_apk_filename }}
+      # upload artifacts alpha
 
-      - name: Archive lite alpha build mappings
-        uses: actions/upload-artifact@v3
+      - name: Archive alpha build mappings
+        uses: actions/upload-artifact@v4
         with:
-          name: Lite alpha build mappings
-          path: app/build/outputs/mapping/liteAlpha
-
-      # upload artifacts default-debug
-
-      - name: Archive default debug build artifacts (universal)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default debug build artifact (universal)
-          path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_universal.apk
-
-      - name: Archive default debug build artifacts (armeabi-v7a)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default debug build artifact (armeabi-v7a)
-          path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_armeabi-v7a.apk
-
-      - name: Archive default debug build artifacts (arm64-v8a)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default debug build artifact (arm64-v8a)
-          path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_arm64-v8a.apk
-
-      - name: Archive default debug build artifacts (x86)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default debug build artifact (x86)
-          path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_x86.apk
-
-      - name: Archive default debug build artifacts (x86_64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default debug build artifact (x86_64)
-          path: app/build/outputs/apk/default/debug/BV_${{ env.default_debug_info_version_code }}_${{ env.default_debug_info_version_name }}_default_x86_64.apk
-
-      # upload artifacts default-alpha
-
-      - name: Archive default alpha build mappings
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default alpha build mappings
+          name: Alpha build mappings
           path: app/build/outputs/mapping/defaultAlpha
 
-      - name: Archive default alpha build artifacts (universal)
-        uses: actions/upload-artifact@v3
+      - name: Archive alpha build artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: Default alpha build artifact (universal)
-          path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_universal.apk
-
-      - name: Archive default alpha build artifacts (armeabi-v7a)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default alpha build artifact (armeabi-v7a)
-          path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_armeabi-v7a.apk
-
-      - name: Archive default alpha build artifacts (arm64-v8a)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default alpha build artifact (arm64-v8a)
-          path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_arm64-v8a.apk
-
-      - name: Archive default alpha build artifacts (x86)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default alpha build artifact (x86)
-          path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_x86.apk
-
-      - name: Archive default alpha build artifacts (x86_64)
-        uses: actions/upload-artifact@v3
-        with:
-          name: Default alpha build artifact (x86_64)
-          path: app/build/outputs/apk/default/alpha/BV_${{ env.default_alpha_info_version_code }}_${{ env.default_alpha_info_version_name }}_default_x86_64.apk
-
+          name: Alpha build artifact
+          path: app/build/outputs/apk/default/alpha/BV_${{ env.alpha_info_version_code }}_${{ env.alpha_info_version_name }}_default_universal.apk