Merge branch 'master' of github.com:gedoor/legado

.github/workflows/web.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: push changes
         if: ${{ github.event_name != 'pull_request' && github.repository == env.UPSTREAM_REPOSITORY }}
-        uses: stefanzweifel/git-auto-commit-action@v5.0.0
+        uses: stefanzweifel/git-auto-commit-action@v5.0.1
         with:
           commit_message: Bump web ${{ env.APP_VER}}
           file_pattern: app/src/main/assets/web/vue/

app/src/main/assets/cronet.json

@@ -1 +1 @@
-{"arm64-v8a":"bbf2c50d1ebf0763d451b08e290a3244","armeabi-v7a":"ecb872f7b1b5342f4d7c36262bec0600","x86":"4da4832b89e2412d808c5b1ecdc24e3d","x86_64":"62080f051db02ed0e939affb39ce67fb","version":"123.0.6312.80"}
+{"x86":"cb929a66b3c21a5b27b49f6ff79b5441","armeabi-v7a":"4b5b7c7be1d4cab7f848d982081062f6","x86_64":"698858d140e577226364d7310ea015fb","arm64-v8a":"d03030209bb386fcf6842b98e93a9942","version":"124.0.6367.82"}

app/src/main/assets/updateLog.md

@@ -13,6 +13,7 @@
 * 漫画源看书显示乱码，**阅读与其他软件的源并不通用**，请导入阅读的支持的漫画源！
 
 **2024/02/27**
+* 更新cronet: 124.0.6367.82
 * 更新cronet: 123.0.6312.80
 * 更新cronet: 123.0.6312.40
 

app/src/main/assets/web/vue/assets/config-Fs1T4bSS.js

@@ -0,0 +1 @@
+import{A as f,u as n}from"./index-Dc0D4E2k.js";import"./vendor-DX7Tq5eS.js";f.getReadConfig().then(e=>{var t=e.data.data;if(t){const a=n();let o=JSON.parse(t),i=a.config;o=Object.assign(i,o),a.setConfig(o)}});

app/src/main/assets/web/vue/assets/config-hE-dr8RX.js

@@ -1 +0,0 @@
-import{A as f,u as n}from"./index-eiEvjBAi.js";import"./vendor-CNdhk-0s.js";f.getReadConfig().then(e=>{var t=e.data.data;if(t){const a=n();let o=JSON.parse(t),i=a.config;o=Object.assign(i,o),a.setConfig(o)}});

app/src/main/assets/web/vue/index.html

@@ -4,8 +4,8 @@
         <meta charset="UTF-8" />
         <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-      <script type="module" crossorigin src="./assets/index-eiEvjBAi.js"></script>
-      <link rel="modulepreload" crossorigin href="./assets/vendor-CNdhk-0s.js">
+      <script type="module" crossorigin src="./assets/index-Dc0D4E2k.js"></script>
+      <link rel="modulepreload" crossorigin href="./assets/vendor-DX7Tq5eS.js">
       <link rel="stylesheet" crossorigin href="./assets/vendor-B7p0W10y.css">
       <link rel="stylesheet" crossorigin href="./assets/index-DT4CNe0X.css">
     </head>

gradle.properties

@@ -42,7 +42,7 @@ android.defaults.buildfeatures.shaders=false
 # and none from the library's dependencies, thereby reducing the size of the R class for that library.
 android.nonTransitiveRClass=true
 # https://chromiumdash.appspot.com/releases?platform=Android
-CronetVersion=123.0.6312.80
-CronetMainVersion=123.0.0.0
+CronetVersion=124.0.6367.82
+CronetMainVersion=124.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true

gradle/libs.versions.toml

@@ -5,9 +5,9 @@ ksp = "1.9.23-1.0.20"
 agp = "8.3.2"
 appcompat = "1.6.1"
 colorpicker = "1.1.0"
-commonsText = "1.11.0"
+commonsText = "1.12.0"
 constraintlayout = "2.1.4"
-core = "1.12.0"
+core = "1.13.0"
 firebaseBom = "32.8.1"
 flexbox = "3.0.0"
 fragment = "1.6.2"
@@ -38,7 +38,7 @@ quickChineseTransfer = "0.2.13"
 room = "2.6.1"
 splitties = "3.0.0"
 
-activity = "1.8.2"
+activity = "1.9.0"
 kotlinxSerialization = "1.6.3"
 swiperefreshlayout = "1.1.0"
 viewpager2 = "1.0.0"
@@ -161,7 +161,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
 
-androidx-benchmark = { id = "androidx.benchmark", version = "1.2.3" }
+androidx-benchmark = { id = "androidx.benchmark", version = "1.2.4" }
 
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

modules/web/package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",
-    "eslint": "^8.40.0",
+    "eslint": "^9.1.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-vue": "^9.12.0",