[pull] master from gedoor:master

.github/dependabot.yml

@@ -7,7 +7,8 @@ version: 2
 registries:
   maven-google:
     type: maven-repository
-    url: https://maven.google.com
+    # url: https://maven.google.com
+    url: https://dl.google.com/dl/android/maven2/
     password: dummy
     username: dummy
   maven-central:

.github/scripts/cronet.sh

@@ -53,6 +53,20 @@ function write_github_env_variable() {
     echo "$1=$2" >> $GITHUB_ENV
 }
 
+function sync_proguard_rules() {
+    local raw_github_git="https://raw.githubusercontent.com/chromium/chromium/$lastest_cronet_version"
+    local proguard_paths=(
+      components/cronet/android/cronet_combined_impl_native_proguard_golden.cfg
+    )
+    local proguard_rules_path="$GITHUB_WORKSPACE/app/cronet-proguard-rules.pro"
+    rm -f $proguard_rules_path
+    echo "fetch cronet proguard rules from upstream $raw_github_git"
+    for path in ${proguard_paths[@]}
+    do
+        echo "fetching $path ..."
+        curl "$raw_github_git/$path" >> $proguard_rules_path
+    done
+}
 ##########
 # 获取本地cronet版本
 path=$GITHUB_WORKSPACE/gradle.properties
@@ -66,6 +80,8 @@ if version_compare $current_cronet_version $lastest_cronet_version; then
     # 更新gradle.properties
     sed -i s/CronetVersion=.*/CronetVersion=$lastest_cronet_version/ $path
     sed -i s/CronetMainVersion=.*/CronetMainVersion=$lastest_cronet_main_version/ $path
+    # 更新cronet_proguard_rules.pro
+    sync_proguard_rules
     # 添加更新日志
     sed "15a* 更新cronet: $lastest_cronet_version" -i $GITHUB_WORKSPACE/app/src/main/assets/updateLog.md
     # 生成pull request信息

.github/workflows/cronet.yml

@@ -49,4 +49,5 @@ jobs:
             *cronet*jar
             *cronet.json
             *updateLog.md
-            gradle.properties
+            *gradle.properties
+            *cronet-proguard-rules.pro

.github/workflows/release.yml

@@ -54,6 +54,7 @@ jobs:
         run: |
           # not use this output
           # echo "KeyStore=yes" >> $GITHUB_OUTPUT
+          echo -e "\n" >> gradle.properties
           echo RELEASE_KEY_ALIAS='${{ secrets.RELEASE_KEY_ALIAS }}' >> gradle.properties
           echo RELEASE_KEY_PASSWORD='${{ secrets.RELEASE_KEY_PASSWORD }}' >> gradle.properties
           echo RELEASE_STORE_PASSWORD='${{ secrets.RELEASE_STORE_PASSWORD }}' >> gradle.properties
@@ -87,7 +88,7 @@ jobs:
 
       - name: Release
         if: ${{ env.product == 'app' }}
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
+        uses: softprops/action-gh-release@v2
         with:
           name: legado_app_${{ env.VERSION }}
           tag_name: ${{ env.VERSION }}

.github/workflows/test.yml

@@ -149,7 +149,9 @@ jobs:
       ylogin: ${{ secrets.LANZOU_ID }}
       phpdisk_info: ${{ secrets.LANZOU_PSD }}
       # 蓝奏云里的文件夹ID（阅读3测试版:2670621）
-      LANZOU_FOLDER_ID: '2670621'
+      LANZOU_FOLDER_ID: ${{ secrets.LANZOU_FOLDER_ID }}
+      #蓝奏云分享链接
+      LANZOU_URL: ${{ secrets.LANZOU_URL }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -162,7 +164,7 @@ jobs:
         run: |
           path="$GITHUB_WORKSPACE/apk/"
           python3 $GITHUB_WORKSPACE/.github/scripts/lzy_web.py "$path" "$LANZOU_FOLDER_ID"
-          echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: https://kunfei.lanzoux.com/b0f810h4b"
+          echo "[$(date -u -d '+8 hour' '+%Y.%m.%d %H:%M:%S')] 分享链接: $LANZOU_URL"
 
   test_Branch:
     needs: [ prepare, build ]
@@ -191,9 +193,6 @@ jobs:
     needs: [ prepare, build ]
     if: ${{ github.event_name != 'pull_request' && needs.prepare.outputs.telegram == 'yes' }}
     runs-on: ubuntu-latest
-    env:
-      CHANNEL_ID: ${{ secrets.CHANNEL_ID }}
-      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -206,7 +205,10 @@ jobs:
           done
           rm -rf */
       - name: Post to channel
-        run: |
-          pip install pyTelegramBotAPI
-          path="$GITHUB_WORKSPACE/apk/"
-          python3 $GITHUB_WORKSPACE/.github/scripts/tg_bot.py "$BOT_TOKEN" "$CHANNEL_ID" "$path"
+        uses: xireiki/channel-post@v1
+        with:
+          chat_id: ${{ secrets.CHANNEL_ID }}
+          bot_token: ${{ secrets.BOT_TOKEN }}
+          context: "#阅读 #Legado #Beta ${{ needs.prepare.outputs.versionL }}"
+          path: apk/*
+          method: sendFile

English.md

@@ -107,7 +107,7 @@ https://gedoor.github.io/Disclaimer
 
 ##### Legado 3.0
 
-* [eBook sources rules](https://alanskycn.gitee.io/teachme)
+* [eBook sources rules](https://mgz0227.github.io/The-tutorial-of-Legado/)
 * [Update Log](/app/src/main/assets/updateLog.md)
 * [Help Documentation](/app/src/main/assets/help/appHelp.md)
 * [web bookshelf](https://github.com/gedoor/legado_web_bookshelf)

README.md

@@ -71,7 +71,7 @@ https://www.yuque.com/legado/wiki/community
 https://gedoor.github.io/Disclaimer
 
 ##### 阅读3.0
-* [书源规则](https://alanskycn.gitee.io/teachme)
+* [书源规则](https://mgz0227.github.io/The-tutorial-of-Legado/)
 * [更新日志](/app/src/main/assets/updateLog.md)
 * [帮助文档](/app/src/main/assets/help/appHelp.md)
 * [web端书架](https://github.com/gedoor/legado_web_bookshelf)

app/build.gradle

@@ -1,10 +1,17 @@
 plugins {
-    id "com.android.application"
-    id 'org.jetbrains.kotlin.android'
-    id 'kotlin-parcelize'
-    //id 'kotlin-kapt'
-    id 'com.google.devtools.ksp'
-    id "com.google.gms.google-services"
+//    id "com.android.application"
+//    id 'org.jetbrains.kotlin.android'
+//    id 'kotlin-parcelize'
+//    //id 'kotlin-kapt'
+//    id 'com.google.devtools.ksp'
+//    id "com.google.gms.google-services"
+
+    alias libs.plugins.android.application
+    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.parcelize
+    alias libs.plugins.room
+    alias libs.plugins.ksp
+    alias libs.plugins.google.services
 }
 apply from: 'download.gradle'
 
@@ -74,7 +81,7 @@ android {
 
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'cronet-proguard-rules.pro'
         }
         debug {
             if (project.hasProperty("RELEASE_STORE_FILE")) {
@@ -83,7 +90,7 @@ android {
             applicationIdSuffix '.debug'
             versionNameSuffix 'debug'
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro', 'cronet-proguard-rules.pro'
         }
     }
     //noinspection GrDeprecatedAPIUsage
@@ -102,11 +109,16 @@ android {
         }
     }
 
+
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
     // 设定Room的KSP参数
     ksp {
         arg("room.incremental", "true")
         arg("room.expandProjection", "true")
-        arg("room.schemaLocation", "$projectDir/schemas")
+        arg("room.generateKotlin", "false")
+        //arg("room.schemaLocation", "$projectDir/schemas")
 
     }
 
@@ -136,133 +148,129 @@ android {
 }
 
 dependencies {
-    compileOnly "com.android.tools.build:gradle:$agp_version"
+    //compileOnly "com.android.tools.build:gradle:$agp_version"
     //noinspection GradleDependency,GradlePackageUpdate
-    coreLibraryDesugaring('com.android.tools:desugar_jdk_libs_nio:2.0.3')
-    testImplementation('junit:junit:4.13.2')
-    androidTestImplementation('androidx.test:runner:1.5.2')
-    androidTestImplementation('androidx.test.ext:junit:1.1.5')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1')
+    //coreLibraryDesugaring('com.android.tools:desugar_jdk_libs_nio:2.0.4')
+    coreLibraryDesugaring(libs.desugar)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.androidTest)
     //kotlin
     //noinspection GradleDependency,DifferentStdlibGradleVersion
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
+    implementation(libs.kotlin.stdlib)
     //Kotlin反射
     //noinspection GradleDependency,DifferentStdlibGradleVersion
-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
+    implementation(libs.kotlin.reflect)
+
+
     //协程
-    def coroutines_version = '1.7.3'
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version")
+    //def coroutines_version = '1.7.3'
+    implementation(libs.bundles.coroutines)
+
 
     //图像处理库Toolkit
-    implementation('com.github.android:renderscript-intrinsics-replacement-toolkit:b6363490c3')
+    implementation(libs.renderscript.intrinsics.replacement.toolkit)
 
     //androidX
-    implementation('androidx.core:core-ktx:1.12.0')
-    implementation('androidx.appcompat:appcompat:1.6.1')
-    implementation('androidx.activity:activity-ktx:1.8.1')
-    implementation('androidx.fragment:fragment-ktx:1.6.2')
-    implementation('androidx.preference:preference-ktx:1.2.1')
-    implementation('androidx.constraintlayout:constraintlayout:2.1.4')
-    implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')
-    implementation('androidx.viewpager2:viewpager2:1.0.0')
-    implementation('androidx.webkit:webkit:1.9.0')
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat.appcompat)
+    implementation(libs.activity.ktx)
+    implementation(libs.fragment.ktx)
+    implementation(libs.preference.ktx)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.androidx.webkit)
 
     //google
-    implementation('com.google.android.material:material:1.10.0')
-    implementation('com.google.android.flexbox:flexbox:3.0.0')
-    implementation('com.google.code.gson:gson:2.10.1')
+    implementation(libs.material)
+    implementation(libs.flexbox)
+    implementation(libs.gson)
 
     //lifecycle
-    def lifecycle_version = '2.6.2'
-    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycle_version")
-    implementation("androidx.lifecycle:lifecycle-service:$lifecycle_version")
+    implementation(libs.lifecycle.common.java8)
+    implementation(libs.lifecycle.service)
 
     //media
-    implementation("androidx.media:media:1.7.0")
+    implementation(libs.media.media)
     // For media playback using ExoPlayer
-    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation(libs.media3.exoplayer)
     // For loading data using the OkHttp network stack
-    implementation "androidx.media3:media3-datasource-okhttp:$media3_version"
+    implementation(libs.media3.datasource.okhttp)
     // For exposing and controlling media sessions
     //implementation "androidx.media3:media3-session:$media3_version"
 
     //Splitties
-    implementation("com.louiscad.splitties:splitties-appctx:$splitties_version")
-    implementation("com.louiscad.splitties:splitties-systemservices:$splitties_version")
-    implementation("com.louiscad.splitties:splitties-views:$splitties_version")
+    implementation(libs.splitties.appctx)
+    implementation(libs.splitties.systemservices)
+    implementation(libs.splitties.views)
 
     //room sql语句不高亮解决方法https://issuetracker.google.com/issues/234612964#comment6
-    implementation("androidx.room:room-runtime:$room_version")
-    implementation("androidx.room:room-ktx:$room_version")
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
     //kapt("androidx.room:room-compiler:$room_version")
-    ksp("androidx.room:room-compiler:$room_version")
-    androidTestImplementation("androidx.room:room-testing:$room_version")
+    ksp(libs.room.compiler)
+    androidTestImplementation(libs.room.testing)
 
     //liveEventBus
-    implementation('com.github.michaellee123:LiveEventBus:1.8.14')
+    implementation(libs.liveeventbus)
 
     //规则相关
-    implementation('org.jsoup:jsoup:1.16.2')
-    implementation('com.jayway.jsonpath:json-path:2.8.0')
-    implementation('cn.wanghaomiao:JsoupXpath:2.5.3')
+    implementation(libs.jsoup)
+    implementation(libs.json.path)
+    implementation(libs.jsoupxpath)
     implementation(project(path: ':modules:book'))
 
     //JS rhino
     implementation(project(path: ':modules:rhino1.7.3'))
 
     //网络
-    implementation('com.squareup.okhttp3:okhttp:4.11.0')
+    implementation(libs.okhttp)
     implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
-    implementation 'com.google.protobuf:protobuf-javalite:3.24.3'
+    implementation(libs.protobuf.javalite)
 
     //Glide
-    def glideVersion = "4.16.0"
-    implementation("com.github.bumptech.glide:glide:$glideVersion")
-    //kapt("com.github.bumptech.glide:compiler:$glideVersion")
-    ksp("com.github.bumptech.glide:ksp:$glideVersion")
+    implementation(libs.glide.glide)
+    ksp(libs.glide.ksp)
 
     //Svg
-    implementation("com.caverock:androidsvg-aar:1.4")
+    implementation(libs.androidsvg)
     //Glide svg plugin
-    implementation("com.github.qoqa:glide-svg:4.0.2")
+    implementation(libs.glide.svg)
 
     //webServer
-    def nanoHttpdVersion = "2.3.1"
-    implementation("org.nanohttpd:nanohttpd:$nanoHttpdVersion")
-    implementation("org.nanohttpd:nanohttpd-websocket:$nanoHttpdVersion")
+    implementation(libs.nanohttpd.nanohttpd)
+    implementation(libs.nanohttpd.websocket)
 
     //二维码
     //noinspection GradleDependency
-    implementation('com.github.jenly1314:zxing-lite:3.0.1')
+    implementation(libs.zxing.lite)
 
     //颜色选择
-    implementation('com.jaredrummler:colorpicker:1.1.0')
+    implementation(libs.colorpicker)
 
     //压缩解压
-    implementation 'me.zhanghai.android.libarchive:library:1.0.3'
+    implementation libs.libarchive
 
     //apache
-    implementation('org.apache.commons:commons-text:1.11.0')
+    implementation(libs.commons.text)
 
     //MarkDown
-    def markwonVersion = "4.6.2"
-    implementation("io.noties.markwon:core:$markwonVersion")
-    implementation("io.noties.markwon:image-glide:$markwonVersion")
-    implementation("io.noties.markwon:ext-tables:$markwonVersion")
-    implementation("io.noties.markwon:html:$markwonVersion")
+    implementation(libs.markwon.core)
+    implementation(libs.markwon.image.glide)
+    implementation(libs.markwon.ext.tables)
+    implementation(libs.markwon.html)
 
     //转换繁体
-    implementation('com.github.liuyueyi.quick-chinese-transfer:quick-transfer-core:0.2.13')
+    implementation(libs.quick.chinese.transfer.core)
 
     //加解密类库,有些书源使用
     //noinspection GradleDependency,GradlePackageUpdate
-    implementation('cn.hutool:hutool-crypto:5.8.22')
+    implementation(libs.hutool.crypto)
 
     //firebase, 崩溃统计和性能统计
-    implementation platform('com.google.firebase:firebase-bom:32.5.0')
-    implementation 'com.google.firebase:firebase-analytics:21.5.0'
-    implementation 'com.google.firebase:firebase-perf:20.5.1'
+    implementation platform(libs.firebase.bom)
+    implementation libs.firebase.analytics
+    implementation libs.firebase.perf
 
     //LeakCanary, 内存泄露检测
     //debugImplementation('com.squareup.leakcanary:leakcanary-android:2.7')