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
diff --git a/sqlite/integration-tests/inspection-room-testapp/build.gradle b/sqlite/integration-tests/inspection-room-testapp/build.gradle
index 356c268..0084551 100644
--- a/sqlite/integration-tests/inspection-room-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-room-testapp/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -24,12 +22,12 @@
}
dependencies {
- implementation(KOTLIN_STDLIB)
- androidTestImplementation(JUNIT)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- androidTestImplementation(ANDROIDX_TEST_EXT_KTX)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ implementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ androidTestImplementation(libs.testExtJunitKtx)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.testRunner)
androidTestImplementation(project(":room:room-runtime"))
androidTestImplementation(project(":sqlite:sqlite-inspection"))
androidTestImplementation(project(":inspection:inspection-testing"))
diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
index 3ff0a85..8de9c32 100644
--- a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
+++ b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -23,14 +21,14 @@
}
dependencies {
- implementation(KOTLIN_STDLIB)
- implementation(SQLDELIGHT_ANDROID)
- androidTestImplementation(JUNIT)
- androidTestImplementation(SQLDELIGHT_COROUTINES_EXT)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- androidTestImplementation(ANDROIDX_TEST_EXT_KTX)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.sqldelightAndroid)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.sqldelightCoroutinesExt)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ androidTestImplementation(libs.testExtJunitKtx)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.testRunner)
androidTestImplementation(project(":sqlite:sqlite-inspection"))
androidTestImplementation(project(":inspection:inspection-testing"))
androidTestImplementation("com.google.protobuf:protobuf-javalite:3.10.0")
diff --git a/sqlite/sqlite-framework/build.gradle b/sqlite/sqlite-framework/build.gradle
index 3b7799f..bfac2ce 100644
--- a/sqlite/sqlite-framework/build.gradle
+++ b/sqlite/sqlite-framework/build.gradle
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension
import androidx.build.Publish
plugins {
diff --git a/sqlite/sqlite-inspection/build.gradle b/sqlite/sqlite-inspection/build.gradle
index 22e08ca..140b1b4 100644
--- a/sqlite/sqlite-inspection/build.gradle
+++ b/sqlite/sqlite-inspection/build.gradle
@@ -18,8 +18,6 @@
import androidx.build.LibraryType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -32,12 +30,12 @@
compileOnly(project(":inspection:inspection"))
androidTestImplementation(project(":inspection:inspection-testing"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(TRUTH)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- androidTestImplementation(KOTLIN_COROUTINES_TEST)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ androidTestImplementation(libs.kotlinCoroutinesTest)
}
androidx {
diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle
index 6e6090c..c4601f50 100644
--- a/sqlite/sqlite-ktx/build.gradle
+++ b/sqlite/sqlite-ktx/build.gradle
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension
import androidx.build.Publish
plugins {
@@ -28,10 +25,10 @@
dependencies {
api(project(":sqlite:sqlite"))
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
- testImplementation(JUNIT)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.junit)
+ testImplementation(libs.mockitoCore)
}
androidx {
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle
index ce6519c..5d410d5 100644
--- a/sqlite/sqlite/build.gradle
+++ b/sqlite/sqlite/build.gradle
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension
import androidx.build.Publish
plugins {
@@ -27,8 +24,8 @@
dependencies {
api("androidx.annotation:annotation:1.0.0")
- testImplementation(JUNIT)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.junit)
+ testImplementation(libs.mockitoCore)
}
// Used by testImplementation in room-compiler
