From a4116185cc673b6e0b8a5dbf270f39ffe343b8ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:05:01 +0000 Subject: [PATCH 1/6] Bump org.jsoup:jsoup from 1.16.2 to 1.17.2 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.2 to 1.17.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.16.2...jsoup-1.17.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9243facb5..cfd33fce0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ lifecycle = "2.7.0" glide = "4.16.0" gson = "2.10.1" jsonPath = "2.9.0" -jsoup = "1.16.2" +jsoup = "1.17.2" jsoupxpath = "2.5.3" coroutines = "1.8.0" liveeventbus = "1.8.14" From ed65514173bc9ff7d3d0e6f56c868b45f1dbf5d5 Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 16 Mar 2024 07:19:06 +0800 Subject: [PATCH 2/6] Update test.yml --- .github/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6068317c..b035d393e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -120,8 +120,7 @@ jobs: - name: Check Build production run: | - cd ${{ github.workspace }}/apk/ - if [ ! -e legado_*.apk ]; then + if [ ! -e "${{ github.workspace }}/apk/legado_*.apk" ]; then echo "Build production not found! Check gradle logs." exit 1 fi @@ -211,4 +210,4 @@ jobs: bot_token: ${{ secrets.BOT_TOKEN }} context: "#阅读 #Legado #Beta ${{ needs.prepare.outputs.versionL }}" path: apk/* - method: sendFile \ No newline at end of file + method: sendFile From 90019dd356bbe25cb3ea52f7419c8ffbe930629d Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 16 Mar 2024 08:19:06 +0800 Subject: [PATCH 3/6] Update AnalyzeByJSoup.kt --- .../java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt index b68336e39..71078a6b3 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt @@ -375,11 +375,12 @@ class AnalyzeByJSoup(doc: Any) { * 根据索引集合筛选元素 * */ if (split == '!') { //排除 - + /* for (pcInt in indexSet) elements[pcInt] = null elements.removeAll(nullSet) //测试过,这样就行 - + */ + for (pcInt in indexSet) elements[pcInt].remove() } else if (split == '.') { //选择 val es = Elements() From fbc5337459a94606cd296fde295260b1fa49bb57 Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 16 Mar 2024 08:29:13 +0800 Subject: [PATCH 4/6] Update proguard-rules.pro --- app/proguard-rules.pro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 4147f2695..49c3da243 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -403,6 +403,10 @@ -dontwarn org.chromium.base.FeatureList -dontwarn org.chromium.base.FeatureMap +# Please add these rules to your existing keep rules in order to suppress warnings. +# This is generated automatically by the Android Gradle plugin. +-dontwarn org.jspecify.annotations.NullMarked + #-------------------Cronet------------------------------------ # Class.forName调用 From 5d0b8e9504351f3b85fee1e38650c06901a0bcee Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:13:07 +0800 Subject: [PATCH 5/6] Update test.yml --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b035d393e..557fa155d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -119,8 +119,9 @@ jobs: path: ${{ github.workspace }}/mapping/missing_rules.txt - name: Check Build production + - working-directory: apk/ run: | - if [ ! -e "${{ github.workspace }}/apk/legado_*.apk" ]; then + if [ ! -e legado_*.apk ]; then echo "Build production not found! Check gradle logs." exit 1 fi From 7d130334e17cb021109518ab1e098580ea81b02b Mon Sep 17 00:00:00 2001 From: Xwite <82232510+Xwite@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:19:10 +0800 Subject: [PATCH 6/6] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 557fa155d..c8961c8b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -119,8 +119,8 @@ jobs: path: ${{ github.workspace }}/mapping/missing_rules.txt - name: Check Build production - - working-directory: apk/ run: | + cd ${{ github.workspace }}/apk/ if [ ! -e legado_*.apk ]; then echo "Build production not found! Check gradle logs." exit 1