From dbd01a43343f9ccd89307c1dd7e1c704a17d8f1d Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Wed, 25 Mar 2026 00:58:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=92=8C=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 13 +++++++++---- gradle/libs.versions.toml | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 087824418..aa6aa707e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -151,6 +151,8 @@ jobs: echo "清空18PlusList.txt" echo "">$GITHUB_WORKSPACE/app/src/main/assets/18PlusList.txt - name: Release Apk Sign + # 仅在所有者的 PR 或 push 时进行签名 + if: ${{ github.actor == 'HapeLee' }} run: | echo "${{ secrets.SIGNING_KEY }}" | base64 -d > $GITHUB_WORKSPACE/app/my-release-key.jks echo "RELEASE_STORE_FILE=my-release-key.jks" >> $GITHUB_WORKSPACE/gradle.properties @@ -232,6 +234,7 @@ jobs: test_Branch: needs: [ prepare, build ] runs-on: ubuntu-latest + # 仅在所有者的非 PR 事件时执行(即所有者 push 到 main 分支时) if: ${{ github.event_name != 'pull_request' && github.actor == 'HapeLee' }} steps: - uses: actions/checkout@v5 @@ -261,9 +264,11 @@ jobs: create_release: needs: [ prepare, build ] + # 仅在所有者的 push 到 main 分支时执行发布 if: | github.event_name == 'push' && github.ref == 'refs/heads/main' && + github.actor == 'HapeLee' && (needs.prepare.outputs.build_number > 0 || needs.prepare.outputs.is_release == 'true') && success() runs-on: ubuntu-latest @@ -289,13 +294,13 @@ jobs: cd artifacts # 重命名 release 版本 for f in *app_${VERSIONL}.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}.apk"; done - for f in *app_${VERSIONL}-arm64-v8a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-arm64-v8a.apk"; done - for f in *app_${VERSIONL}-armeabi-v7a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-armeabi-v7a.apk"; done + for f in *app_${VERSIONL}_arm64-v8a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-arm64-v8a.apk"; done + for f in *app_${VERSIONL}_armeabi-v7a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-armeabi-v7a.apk"; done # 重命名 noR8 版本 (如果存在) for f in *app_${VERSIONL}-noR8.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-noR8.apk"; done - for f in *app_${VERSIONL}-noR8-arm64-v8a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-noR8-arm64-v8a.apk"; done - for f in *app_${VERSIONL}-noR8-armeabi-v7a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-noR8-armeabi-v7a.apk"; done + for f in *app_${VERSIONL}-noR8_arm64-v8a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-noR8-arm64-v8a.apk"; done + for f in *app_${VERSIONL}-noR8_armeabi-v7a.apk; do [ -f "$f" ] && mv "$f" "legado-${VERSIONL}-noR8-armeabi-v7a.apk"; done ls -l diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4f18269db..275c1ac83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,29 +1,29 @@ [versions] accompanistWebview = "0.36.0" -adaptive = "1.3.0-alpha06" -adaptiveLayout = "1.3.0-alpha06" -adaptiveNavigation = "1.3.0-alpha06" +adaptive = "1.3.0-alpha09" +adaptiveLayout = "1.3.0-alpha09" +adaptiveNavigation = "1.3.0-alpha09" animation = "1.10.1" biometric = "1.2.0" coilCompose = "2.7.0" -composeBom = "2026.01.00" +composeBom = "2026.03.00" constraintlayoutCompose = "1.1.1" coreSplashscreen = "1.2.0" -datastorePreferences = "1.2.0" -foundation = "1.10.1" -kotlin = "2.3.0" +datastorePreferences = "1.2.1" +foundation = "1.10.5" +kotlin = "2.3.10" kotlinxSerialization = "1.10.0" kotlinxCoroutinesAndroid = "1.10.2" kotlinxSerializationJson = "1.10.0" -ksp = "2.3.4" +ksp = "2.3.6" agp = "8.13.2" appcompat = "1.7.1" colorpicker = "1.1.0" colorpicker-compose = "1.1.3" commonsText = "1.15.0" constraintlayout = "2.2.1" -core = "1.17.0" +core = "1.18.0" firebaseBom = "34.6.0" flexbox = "3.0.0" fragment = "1.8.9" @@ -43,17 +43,17 @@ jsoupxpath = "2.5.3" coroutines = "1.10.2" lifecycleViewmodelCompose = "2.10.0" liveeventbus = "1.8.14" -navigation3 = "1.0.0" +navigation3 = "1.0.1" markdownCompose = "0.5.0" markwon = "4.6.2" -material = "1.14.0-alpha08" -material3 = "1.5.0-alpha12" +material = "1.14.0-alpha10" +material3 = "1.5.0-alpha15" material3IconsExtended = "1.7.8" -materialKolor = "4.1.0" +materialKolor = "4.1.1" media = "1.7.1" media3 = "1.8.0" nanoHttpd = "2.3.1" -navigationCompose = "2.9.6" +navigationCompose = "2.9.7" okhttp = "5.3.2" palette = "1.0.0" preference = "1.2.1" @@ -64,7 +64,7 @@ splitties = "3.0.0" rhino = "1.8.1" desugar = "2.1.5" -activity = "1.12.2" +activity = "1.13.0" #kotlinxSerialization = "1.8.0" startupRuntime = "1.2.0" swiperefreshlayout = "1.2.0" @@ -74,15 +74,15 @@ recyclerview = "1.4.0" uiViewbinding = "1.9.4" viewpager2 = "1.1.0" webkit = "1.15.0" -collection = "1.5.0" +collection = "1.6.0" zxingLite = "3.3.0" -koin-bom = "4.1.1" +koin-bom = "4.2.0" biometricKtx = "1.1.0" reorderable = "3.0.0" -haze = "1.7.1" +haze = "1.7.2" [libraries] accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanistWebview" }