diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b035d393e..c8961c8b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -120,7 +120,8 @@ jobs: - name: Check Build production run: | - if [ ! -e "${{ github.workspace }}/apk/legado_*.apk" ]; then + cd ${{ github.workspace }}/apk/ + if [ ! -e legado_*.apk ]; then echo "Build production not found! Check gradle logs." exit 1 fi 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调用 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() 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"