From 2d7b024293ec645a958559f3da5ed9807a99afe8 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:18:56 +0800
Subject: [PATCH] Fix unused resources inspection not working in AS (#200)
* Fix unused resources inspection not working in AS
* Remove unused resources
* Update CI
* Fix CI
* Add baseline for lint
* Test CI
---
.github/workflows/ci.yml | 3 -
app/build.gradle.kts | 10 +-
app/lint-baseline.xml | 202 ++++++++++++++++++
.../res/drawable/v_arrow_left_dark_x24.xml | 28 ---
.../main/res/drawable/v_reply_dark_x24.xml | 28 ---
app/src/main/res/drawable/v_send_dark_x24.xml | 28 ---
.../main/res/layout/dialog_recycler_view.xml | 22 --
app/src/main/res/values-de/strings.xml | 1 -
app/src/main/res/values-es/strings.xml | 1 -
app/src/main/res/values-fr/strings.xml | 1 -
app/src/main/res/values-ja/strings.xml | 1 -
app/src/main/res/values-ko/strings.xml | 1 -
app/src/main/res/values-nb-rNO/strings.xml | 1 -
app/src/main/res/values-th/strings.xml | 1 -
app/src/main/res/values-zh-rCN/strings.xml | 1 -
app/src/main/res/values-zh-rHK/strings.xml | 1 -
app/src/main/res/values-zh-rTW/strings.xml | 1 -
app/src/main/res/values/dimens.xml | 2 -
app/src/main/res/values/pathdata.xml | 3 -
app/src/main/res/values/strings.xml | 1 -
gradle.properties | 2 +-
gradle/libs.versions.toml | 2 +-
22 files changed, 207 insertions(+), 134 deletions(-)
create mode 100644 app/lint-baseline.xml
delete mode 100644 app/src/main/res/drawable/v_arrow_left_dark_x24.xml
delete mode 100644 app/src/main/res/drawable/v_reply_dark_x24.xml
delete mode 100644 app/src/main/res/drawable/v_send_dark_x24.xml
delete mode 100644 app/src/main/res/layout/dialog_recycler_view.xml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 694d459e3..6608a3e07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,9 +48,6 @@ jobs:
- name: Spotless Check
run: ./gradlew spotlessCheck
- - name: Lint Check
- run: ./gradlew lintMarshmallowGmsRelease
-
- name: CMake Cache
uses: actions/cache@v3
with:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7ca8ec78c..7b0d68c6c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -109,10 +109,6 @@ android {
compileOptions {
isCoreLibraryDesugaringEnabled = true
}
- lint {
- checkOnly += setOf("InlinedApi", "NewApi", "UnusedAttribute")
- error += setOf("InlinedApi", "UnusedAttribute")
- }
}
create("oss") {
dimension = "oss"
@@ -154,9 +150,9 @@ android {
}
lint {
- abortOnError = true
- checkReleaseBuilds = false
- disable.add("MissingTranslation")
+ baseline = file("lint-baseline.xml")
+ disable += setOf("MissingTranslation", "MissingQuantity")
+ fatal += setOf("NewApi", "InlineApi")
}
packaging {
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
new file mode 100644
index 000000000..21ca0b6dd
--- /dev/null
+++ b/app/lint-baseline.xml
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml b/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
deleted file mode 100644
index 09d87b790..000000000
--- a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_reply_dark_x24.xml b/app/src/main/res/drawable/v_reply_dark_x24.xml
deleted file mode 100644
index 2fc5657b7..000000000
--- a/app/src/main/res/drawable/v_reply_dark_x24.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_send_dark_x24.xml b/app/src/main/res/drawable/v_send_dark_x24.xml
deleted file mode 100644
index c2d95201c..000000000
--- a/app/src/main/res/drawable/v_send_dark_x24.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
deleted file mode 100644
index 161f85f52..000000000
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d45967f74..8da00eeec 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -165,7 +165,6 @@
♥ %d
%1$s (%2$.2f, %3$d)
Kommentare der Galerie
- Keine Kommentare
Kommentar erfolgreich gesendet
Kommentar nicht gesendet
Inhalt des Kommentars kopieren
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5b84b1cb4..11508e993 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -198,7 +198,6 @@
Comentarios de la galería
- Sin comentarios en esta galería
Comentario publicado
Copiar texto de comentario
Votar positivo
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6a33e3ffe..f2ad5895c 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -211,7 +211,6 @@
Commentaires de la galerie
- Personne n\'a commenté sur la galerie
Commentaire posté
Impossible de commenter
Copier le texte du commentaire
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e585568fa..d819ae7c8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -210,7 +210,6 @@
ギャラリーコメント
- コメントはまだありません。
コメントを送信しました。
コメントに失敗しました。
コメントをコピー
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a82e925b3..ae6e92d94 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -185,7 +185,6 @@
갤러리 코멘트
- 코멘트가 없습니다.
코멘트를 남겼습니다.
코멘트를 남기지 못했습니다.
코멘트 텍스트 복사
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 026a16213..7a39cd986 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -129,7 +129,6 @@
Størrelse
Flytt
Torrenter
- Ingen kommentar.
Gallerikommentarer
Venter
Mislykket
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 40421462c..a356acfaa 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -200,7 +200,6 @@
การแสดงความคิดเห็นในแกลเลอรี่
- ไม่มีความคิดเห็น
แสดงความคิดเห็นเสร็จเรียบร้อยแล้ว
การแสดงความคิดเห็นล้มเหลว
คัดลอกข้อความของความคิดเห็น
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 763ebecc7..fae5d3a16 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -204,7 +204,6 @@
种子链接
画廊评论
- 暂时没有评论
评论成功
评论失败
复制评论文字
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index b7b7e5489..b460fb20f 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -216,7 +216,6 @@
畫廊評論
- 暫時沒有評論
評論成功
評論失敗
複製評論文字
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f7cb74e87..df0d03552 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -204,7 +204,6 @@
種子連結
圖庫留言
- 目前沒有留言
留言成功
留言失敗
複製留言文字
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5110ce628..2e39d4ea7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -68,8 +68,6 @@
56dp
40dp
- 64dp
-
16dp
128dp
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index 77e4c9288..0e5941b07 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -27,9 +27,6 @@
M13,13L17,17L21,13H18V10C18,6.1,14.9,3,11,3S4,6.1,4,10V17H6V10C6,7.2,8.2,5,11,5S16,7.2,16,10V13H13M,16,19H18V21H16V19Z
M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z
M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z
- M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z
- M10,9V5L3,12L10,19V14.9C15,14.9 18.5,16.5 21,20C20,15 17,10 10,9Z
- M2,21L23,12L2,3V10L17,12L2,14V21Z
M19,3H5C3.9,3,3,3.9,3,5V19C3,20.1,3.9,21,5,21H19C20.1,21,21,20.1,21,19V5C21,3.9,20.1,3,19,3ZM12,17L7,12H10V8H14V12H17L12,17Z
M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z
M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M6,20H15L18,20V12L14,16L12,14L6,20M8,9A2,2 0 0,0 6,11A2,2 0 0,0 8,13A2,2 0 0,0 10,11A2,2 0 0,0 8,9Z
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df9340d8c..c1e7cb561 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -246,7 +246,6 @@
Torrent URL
Gallery Comments
- No comment.
Comment post successfully
Failed to post the comment
Copy comment text
diff --git a/gradle.properties b/gradle.properties
index a5f9e48ae..fcaebeb01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,6 @@ org.gradle.caching=true
android.useAndroidX=true
android.enableAppCompileTimeRClass=true
android.experimental.enableNewResourceShrinker.preciseShrinking=true
-android.experimental.lint.version=8.3.0-alpha10
+android.experimental.lint.version=8.3.0-alpha12
android.lint.useK2Uast=true
kotlin.experimental.tryK2=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca7bc4818..a459072c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
[versions]
aboutlibraries = "10.9.2"
agp = "8.1.2"
-android-tools-r8 = "8.3.12-dev"
+android-tools-r8 = "8.3.16-dev"
androidx-activity = "1.8.0"
androidx-appcompat = "1.6.1"
androidx-biometric = "1.2.0-alpha05"