From df83611b55bf1fe50ee1ce06848d044ae742b0ef Mon Sep 17 00:00:00 2001 From: Oscar Mira Date: Wed, 30 Oct 2024 16:48:12 +0100 Subject: [PATCH] Update lint version to align with AGP. Resolves #13759 --- dependencies.gradle.kts | 2 +- gradle/verification-metadata.xml | 51 ++----------------- .../org/signal/lint/CardViewDetectorTest.java | 18 +++---- .../java/org/signal/lint/LogDetectorTest.java | 4 +- .../src/test/resources/CardViewStub.java | 2 +- 5 files changed, 16 insertions(+), 61 deletions(-) diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index 2262590630..6b92072271 100644 --- a/dependencies.gradle.kts +++ b/dependencies.gradle.kts @@ -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") diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2c46272f88..9264718e51 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4213,16 +4213,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -4233,16 +4223,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -4253,16 +4233,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -4273,11 +4243,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -4288,16 +4253,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -4308,9 +4263,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + diff --git a/lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java b/lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java index a6dd6924d2..725f904eb2 100644 --- a/lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java +++ b/lintchecks/src/test/java/org/signal/lint/CardViewDetectorTest.java @@ -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" + diff --git a/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java b/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java index a1911ab70b..63a977a88e 100644 --- a/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java +++ b/lintchecks/src/test/java/org/signal/lint/LogDetectorTest.java @@ -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" + diff --git a/lintchecks/src/test/resources/CardViewStub.java b/lintchecks/src/test/resources/CardViewStub.java index 97860064a8..1afd20e2f5 100644 --- a/lintchecks/src/test/resources/CardViewStub.java +++ b/lintchecks/src/test/resources/CardViewStub.java @@ -1,4 +1,4 @@ -package androidx.appcompat.app; +package androidx.cardview.widget; public class CardView {