Fix Permissions lint tests (#1080)

Co-authored-by: Ben Trengrove <bentrengrove@google.com>
google · Mar 16, 2022 · ae09f50 · ae09f50
1 parent da4fb72
commit ae09f50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ composesnapshot = "-" # a single character = no snapshot
 
 # gradlePlugin and lint need to be updated together
 gradlePlugin = "7.1.2"
-lint = "30.0.3"
+lintMinCompose = "30.0.0"
 
 ktlint = "0.42.1"
 kotlin = "1.6.10"
@@ -80,8 +80,8 @@ robolectric = "org.robolectric:robolectric:4.5.1"
 affectedmoduledetector = "com.dropbox.affectedmoduledetector:affectedmoduledetector:0.1.2"
 
 android-tools-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
-android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref = "lint" }
-android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" }
-android-tools-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lint" }
+android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref = "lintMinCompose" }
+android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lintMinCompose" }
+android-tools-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lintMinCompose" }
 
 squareup-mockwebserver = "com.squareup.okhttp3:mockwebserver:4.9.3"
diff --git a/permissions-lint/build.gradle b/permissions-lint/build.gradle
@@ -71,11 +71,13 @@ dependencies {
 
     compileOnly libs.android.tools.lint.api
     compileOnly libs.kotlin.reflect
-    compileOnly libs.kotlin.stdlibJdk8 // Needed, cannot use `stdlib`
+    compileOnly libs.kotlin.stdlib
+    compileOnly libs.kotlin.stdlibJdk8 // Override version from transitive dependencies
 
     testImplementation libs.junit
     testImplementation libs.kotlin.reflect
-    testImplementation libs.kotlin.stdlibJdk8 // Needed, cannot use `stdlib`
+    testImplementation libs.kotlin.stdlib
+    testImplementation libs.kotlin.stdlibJdk8 // Override version from transitive dependencies
     testImplementation libs.android.tools.lint.lint
     testImplementation libs.android.tools.lint.tests
 }