commit b3483fd918e5a3b501a9d43075a8171e87d8b10a
author Aurimas Liutikas <aurimas@google.com> Fri Jun 04 16:56:37 2021 -0700
committer Aurimas Liutikas <aurimas@google.com> Tue Jun 08 08:30:32 2021 -0700
tree 42287832f6db53ac954c468d3a3f4d0edf1237ae
parent 2d94b3b075e2f3aba039c4d2f0472e9966941aee

Migrate miscellaneous libraries to use Gradle Version Catalogs

- Ran development/versionCatalogMigrate.sh
- Manually updated imports in build.gradle files

Test: ./gradlew tasks
Change-Id: Ic0872dc732acbfdfa8e53590d5a9ddfa560ccd55

leanback/leanback-paging/build.gradle

diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index 18e9338..3585e40 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -2,7 +2,6 @@
 import androidx.build.LibraryVersions
 import androidx.build.Publish
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
 
 plugins {
     id("AndroidXPlugin")
@@ -15,20 +14,20 @@
     api("androidx.leanback:leanback:1.1.0-beta01")
     api("androidx.paging:paging-runtime:3.0.0-beta03")
 
-    androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
-    androidTestImplementation(ANDROIDX_TEST_CORE)
-    androidTestImplementation(ANDROIDX_TEST_RUNNER)
-    androidTestImplementation(ANDROIDX_TEST_RULES)
-    androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
-    androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it"s own MockMaker
-    androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it"s own MockMaker
+    androidTestImplementation(libs.testExtJunit)
+    androidTestImplementation(libs.testCore)
+    androidTestImplementation(libs.testRunner)
+    androidTestImplementation(libs.testRules)
+    androidTestImplementation(libs.espressoCore, excludes.espresso)
+    androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker
+    androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker
     androidTestImplementation(project(":internal-testutils-espresso"))
     androidTestImplementation(project(":internal-testutils-runtime"))
     androidTestImplementation(project(":internal-testutils-common"))
     androidTestImplementation(project(":internal-testutils-ktx"))
     androidTestImplementation(project(":internal-testutils-paging"))
-    androidTestImplementation(KOTLIN_TEST)
-    androidTestImplementation(KOTLIN_COROUTINES_TEST)
+    androidTestImplementation(libs.kotlinTest)
+    androidTestImplementation(libs.kotlinCoroutinesTest)
     androidTestImplementation("androidx.arch.core:core-testing:2.1.0")
     androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing"))
 }