Skip to content

Commit df83611

Browse files
valldracgreyson-signal
valldrac
authored and
greyson-signal
committed
Update lint version to align with AGP.
Resolves signalapp#13759
1 parent 8bdcd58 commit df83611

File tree

5 files changed

+16
-61
lines changed

5 files changed

+16
-61
lines changed

‎dependencies.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ dependencyResolutionManagement {
215215
}
216216

217217
create("lintLibs") {
218-
version("lint", "30.2.2")
218+
version("lint", "31.4.0") // Lint version is AGP version + 23.0.0
219219

220220
library("lint-api", "com.android.tools.lint", "lint-api").versionRef("lint")
221221
library("lint-checks", "com.android.tools.lint", "lint-checks").versionRef("lint")

‎gradle/verification-metadata.xml

+3-48
Original file line numberDiff line numberDiff line change
@@ -4213,16 +4213,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
42134213
<sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
42144214
</artifact>
42154215
</component>
4216-
<component group="com.android.tools.lint" name="lint" version="30.2.2">
4217-
<artifact name="lint-30.2.2.jar">
4218-
<sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
4219-
</artifact>
4220-
</component>
4221-
<component group="com.android.tools.lint" name="lint" version="31.0.2">
4222-
<artifact name="lint-31.0.2.jar">
4223-
<sha256 value="e2a2b4f88cf9977021161361c242a6ec8476eaba67fae00074fa0f2eb03252bc" origin="Generated by Gradle"/>
4224-
</artifact>
4225-
</component>
42264216
<component group="com.android.tools.lint" name="lint" version="31.4.0">
42274217
<artifact name="lint-31.4.0.jar">
42284218
<sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
@@ -4233,16 +4223,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
42334223
<sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
42344224
</artifact>
42354225
</component>
4236-
<component group="com.android.tools.lint" name="lint-api" version="30.2.2">
4237-
<artifact name="lint-api-30.2.2.jar">
4238-
<sha256 value="7c76cb21662660fa7ffe79afc44b59bf13ec2cf5e640d40e2c2d3e5a2b0cd4c9" origin="Generated by Gradle"/>
4239-
</artifact>
4240-
</component>
4241-
<component group="com.android.tools.lint" name="lint-api" version="31.0.2">
4242-
<artifact name="lint-api-31.0.2.jar">
4243-
<sha256 value="b574c059dbe7c0bd5a8fb99b239e6ba844484a59c6622f2636c107eb87c3c24b" origin="Generated by Gradle"/>
4244-
</artifact>
4245-
</component>
42464226
<component group="com.android.tools.lint" name="lint-api" version="31.4.0">
42474227
<artifact name="lint-api-31.4.0.jar">
42484228
<sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
@@ -4253,16 +4233,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
42534233
<sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
42544234
</artifact>
42554235
</component>
4256-
<component group="com.android.tools.lint" name="lint-checks" version="30.2.2">
4257-
<artifact name="lint-checks-30.2.2.jar">
4258-
<sha256 value="c50975fed874d92d95e48123eb68251ce5155f8942f62ee6e772388464c2a4d5" origin="Generated by Gradle"/>
4259-
</artifact>
4260-
</component>
4261-
<component group="com.android.tools.lint" name="lint-checks" version="31.0.2">
4262-
<artifact name="lint-checks-31.0.2.jar">
4263-
<sha256 value="67d210b6331030d27b11d7e081a9d299eb1d7a5519304de5a2c00fbb19044d42" origin="Generated by Gradle"/>
4264-
</artifact>
4265-
</component>
42664236
<component group="com.android.tools.lint" name="lint-checks" version="31.4.0">
42674237
<artifact name="lint-checks-31.4.0.jar">
42684238
<sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
@@ -4273,11 +4243,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
42734243
<sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
42744244
</artifact>
42754245
</component>
4276-
<component group="com.android.tools.lint" name="lint-gradle" version="31.0.2">
4277-
<artifact name="lint-gradle-31.0.2.jar">
4278-
<sha256 value="0d34bcad5e346ebb6324ff8eee79d8fc418fa9a77892ffe17d48ea7677654a6d" origin="Generated by Gradle"/>
4279-
</artifact>
4280-
</component>
42814246
<component group="com.android.tools.lint" name="lint-gradle" version="31.4.0">
42824247
<artifact name="lint-gradle-31.4.0.jar">
42834248
<sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
@@ -4288,16 +4253,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
42884253
<sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
42894254
</artifact>
42904255
</component>
4291-
<component group="com.android.tools.lint" name="lint-model" version="30.2.2">
4292-
<artifact name="lint-model-30.2.2.jar">
4293-
<sha256 value="b7e988df12d6241e8f06f4d353790d01e268e955b2b7b35286d0fa5233e8a045" origin="Generated by Gradle"/>
4294-
</artifact>
4295-
</component>
4296-
<component group="com.android.tools.lint" name="lint-model" version="31.0.2">
4297-
<artifact name="lint-model-31.0.2.jar">
4298-
<sha256 value="162eb85f27efc7b11821f80bb9861a02bb979127beba9b265155c19c80f809ac" origin="Generated by Gradle"/>
4299-
</artifact>
4300-
</component>
43014256
<component group="com.android.tools.lint" name="lint-model" version="31.4.0">
43024257
<artifact name="lint-model-31.4.0.jar">
43034258
<sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
@@ -4308,9 +4263,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
43084263
<sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
43094264
</artifact>
43104265
</component>
4311-
<component group="com.android.tools.lint" name="lint-tests" version="30.2.2">
4312-
<artifact name="lint-tests-30.2.2.jar">
4313-
<sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
4266+
<component group="com.android.tools.lint" name="lint-tests" version="31.4.0">
4267+
<artifact name="lint-tests-31.4.0.jar">
4268+
<sha256 value="1466d17c3df63ccd569b7c567fabc3c80090ced6f193e25bbb7043d0a4f91801" origin="Generated by Gradle"/>
43144269
</artifact>
43154270
</component>
43164271
<component group="com.android.tools.lint" name="lint-typedef-remover" version="31.0.2">

‎lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public void cardViewUsed_LogCardViewUsage_1_arg() {
2424
java("package foo;\n" +
2525
"import androidx.cardview.widget.CardView;\n" +
2626
"public class Example {\n" +
27-
" public void buildDialog() {\n" +
27+
" public void buildCardView() {\n" +
2828
" new CardView(context);\n" +
2929
" }\n" +
3030
"}")
3131
)
32-
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
32+
.issues(CardViewDetector.CARD_VIEW_USAGE)
3333
.run()
3434
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
3535
" new CardView(context);\n" +
36-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
36+
" ~~~~~~~~~~~~~~~~~~~~~\n" +
3737
"0 errors, 1 warnings")
3838
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context):\n" +
3939
"@@ -5 +5\n" +
@@ -48,16 +48,16 @@ public void cardViewUsed_LogCardViewUsage_2_arg() {
4848
java("package foo;\n" +
4949
"import androidx.cardview.widget.CardView;\n" +
5050
"public class Example {\n" +
51-
" public void buildDialog() {\n" +
51+
" public void buildCardView() {\n" +
5252
" new CardView(context, attrs);\n" +
5353
" }\n" +
5454
"}")
5555
)
56-
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
56+
.issues(CardViewDetector.CARD_VIEW_USAGE)
5757
.run()
5858
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
5959
" new CardView(context, attrs);\n" +
60-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
60+
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
6161
"0 errors, 1 warnings")
6262
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context, attrs):\n" +
6363
"@@ -5 +5\n" +
@@ -72,17 +72,17 @@ public void cardViewUsed_withAssignment_LogCardViewUsage_1_arg() {
7272
java("package foo;\n" +
7373
"import androidx.cardview.widget.CardView;\n" +
7474
"public class Example {\n" +
75-
" public void buildDialog() {\n" +
75+
" public void buildCardView() {\n" +
7676
" CardView cardView = new CardView(context)\n" +
7777
" ;\n" +
7878
" }\n" +
7979
"}")
8080
)
81-
.issues(AlertDialogBuilderDetector.ALERT_DIALOG_BUILDER_USAGE)
81+
.issues(CardViewDetector.CARD_VIEW_USAGE)
8282
.run()
8383
.expect("src/foo/Example.java:5: Warning: Using 'androidx.cardview.widget.CardView' instead of com.google.android.material.card.MaterialCardView [CardViewUsage]\n" +
8484
" CardView cardView = new CardView(context)\n" +
85-
" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
85+
" ~~~~~~~~~~~~~~~~~~~~~\n" +
8686
"0 errors, 1 warnings")
8787
.expectFixDiffs("Fix for src/foo/Example.java line 5: Replace with new com.google.android.material.card.MaterialCardView(context):\n" +
8888
"@@ -5 +5\n" +

‎lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void log_uses_tag_constant() {
121121
lint()
122122
.files(appLogStub,
123123
java("package foo;\n" +
124-
"import org.signal.log.Log;\n" +
124+
"import org.signal.core.util.logging.Log;\n" +
125125
"public class Example {\n" +
126126
" private static final String TAG = Log.tag(Example.class);\n" +
127127
" public void log() {\n" +
@@ -178,7 +178,7 @@ public void log_uses_inline_tag() {
178178
lint()
179179
.files(appLogStub,
180180
java("package foo;\n" +
181-
"import org.signal.log.Log;\n" +
181+
"import org.signal.core.util.logging.Log;\n" +
182182
"public class Example {\n" +
183183
" public void log() {\n" +
184184
" Log.d(\"TAG\", \"msg\");\n" +

‎lintchecks/src/test/resources/CardViewStub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package androidx.appcompat.app;
1+
package androidx.cardview.widget;
22

33
public class CardView {
44

0 commit comments

Comments
 (0)