empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update lint version to align with AGP.

Browse source 
Resolves #13759
This commit is contained in:
Oscar Mira 2024-10-30 16:48:12 +01:00 • committed by Greyson Parrelli
parent 8bdcd588a0
commit df83611b55
5 changed files with 16 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dependencies.gradle.kts
View file

@ -215,7 +215,7 @@ dependencyResolutionManagement {
}
create("lintLibs") {
version("lint", "30.2.2")
version("lint", "31.4.0") // Lint version is AGP version + 23.0.0
library("lint-api", "com.android.tools.lint", "lint-api").versionRef("lint")
library("lint-checks", "com.android.tools.lint", "lint-checks").versionRef("lint")

51
gradle/verification-metadata.xml
View file

@ -4213,16 +4213,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint" version="30.2.2">
<artifact name="lint-30.2.2.jar">
<sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint" version="31.0.2">
<artifact name="lint-31.0.2.jar">
<sha256 value="e2a2b4f88cf9977021161361c242a6ec8476eaba67fae00074fa0f2eb03252bc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint" version="31.4.0">
<artifact name="lint-31.4.0.jar">
<sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
@ -4233,16 +4223,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-api" version="30.2.2">
<artifact name="lint-api-30.2.2.jar">
<sha256 value="7c76cb21662660fa7ffe79afc44b59bf13ec2cf5e640d40e2c2d3e5a2b0cd4c9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-api" version="31.0.2">
<artifact name="lint-api-31.0.2.jar">
<sha256 value="b574c059dbe7c0bd5a8fb99b239e6ba844484a59c6622f2636c107eb87c3c24b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-api" version="31.4.0">
<artifact name="lint-api-31.4.0.jar">
<sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
@ -4253,16 +4233,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-checks" version="30.2.2">
<artifact name="lint-checks-30.2.2.jar">
<sha256 value="c50975fed874d92d95e48123eb68251ce5155f8942f62ee6e772388464c2a4d5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-checks" version="31.0.2">
<artifact name="lint-checks-31.0.2.jar">
<sha256 value="67d210b6331030d27b11d7e081a9d299eb1d7a5519304de5a2c00fbb19044d42" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-checks" version="31.4.0">
<artifact name="lint-checks-31.4.0.jar">
<sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
@ -4273,11 +4243,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-gradle" version="31.0.2">
<artifact name="lint-gradle-31.0.2.jar">
<sha256 value="0d34bcad5e346ebb6324ff8eee79d8fc418fa9a77892ffe17d48ea7677654a6d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-gradle" version="31.4.0">
<artifact name="lint-gradle-31.4.0.jar">
<sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
@ -4288,16 +4253,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-model" version="30.2.2">
<artifact name="lint-model-30.2.2.jar">
<sha256 value="b7e988df12d6241e8f06f4d353790d01e268e955b2b7b35286d0fa5233e8a045" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-model" version="31.0.2">
<artifact name="lint-model-31.0.2.jar">
<sha256 value="162eb85f27efc7b11821f80bb9861a02bb979127beba9b265155c19c80f809ac" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-model" version="31.4.0">
<artifact name="lint-model-31.4.0.jar">
<sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
@ -4308,9 +4263,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-tests" version="30.2.2">
<artifact name="lint-tests-30.2.2.jar">
<sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
<component group="com.android.tools.lint" name="lint-tests" version="31.4.0">
<artifact name="lint-tests-31.4.0.jar">
<sha256 value="1466d17c3df63ccd569b7c567fabc3c80090ced6f193e25bbb7043d0a4f91801" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-typedef-remover" version="31.0.2">

18
lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java
View file

@ -24,16 +24,16 @@ public final class CardViewDetectorTest {
java("package foo;\n" +
"import androidx.cardview.widget.CardView;\n" +
"public class Example {\n" +
" public void buildDialog() {\n" +
" public void buildCardView() {\n" +
" new CardView(context);\n" +
" }\n" +
"}")
)
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
.issues(CardViewDetector.CARD_VIEW_USAGE)
.run()
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
" new CardView(context);\n" +
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
" ~~~~~~~~~~~~~~~~~~~~~\n" +
"0 errors, 1 warnings")
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context):\n" +
"@@ -5 +5\n" +
@ -48,16 +48,16 @@ public final class CardViewDetectorTest {
java("package foo;\n" +
"import androidx.cardview.widget.CardView;\n" +
"public class Example {\n" +
" public void buildDialog() {\n" +
" public void buildCardView() {\n" +
" new CardView(context, attrs);\n" +
" }\n" +
"}")
)
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
.issues(CardViewDetector.CARD_VIEW_USAGE)
.run()
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
" new CardView(context, attrs);\n" +
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
"0 errors, 1 warnings")
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context, attrs):\n" +
"@@ -5 +5\n" +
@ -72,17 +72,17 @@ public final class CardViewDetectorTest {
java("package foo;\n" +
"import androidx.cardview.widget.CardView;\n" +
"public class Example {\n" +
" public void buildDialog() {\n" +
" public void buildCardView() {\n" +
" CardView cardView = new CardView(context)\n" +
" ;\n" +
" }\n" +
"}")
)
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
.issues(CardViewDetector.CARD_VIEW_USAGE)
.run()
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
" CardView cardView = new CardView(context)\n" +
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
" ~~~~~~~~~~~~~~~~~~~~~\n" +
"0 errors, 1 warnings")
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context):\n" +
"@@ -5 +5\n" +

4
lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java
View file

@ -121,7 +121,7 @@ public final class LogDetectorTest {
lint()
.files(appLogStub,
java("package foo;\n" +
"import org.signal.log.Log;\n" +
"import org.signal.core.util.logging.Log;\n" +
"public class Example {\n" +
" private static final String TAG = Log.tag(Example.class);\n" +
" public void log() {\n" +
@ -178,7 +178,7 @@ public final class LogDetectorTest {
lint()
.files(appLogStub,
java("package foo;\n" +
"import org.signal.log.Log;\n" +
"import org.signal.core.util.logging.Log;\n" +
"public class Example {\n" +
" public void log() {\n" +
" Log.d(\"TAG\", \"msg\");\n" +

2
lintchecks/src/test/resources/CardViewStub.java
View file

@ -1,4 +1,4 @@
package androidx.appcompat.app;
package androidx.cardview.widget;
public class CardView {