Migrate window to use Gradle Version Catalogs
- Ran development/versionCatalogMigrate.sh
- Manually updated imports in build.gradle files
Test: ./gradlew tasks
Change-Id: I344898898bc44cb8817a84cdb2ef6c354b7fa24e
diff --git a/window/window-extensions/build.gradle b/window/window-extensions/build.gradle
index 5ee89bc..f0431c0 100644
--- a/window/window-extensions/build.gradle
+++ b/window/window-extensions/build.gradle
@@ -19,13 +19,6 @@
import androidx.build.Publish
import androidx.build.RunApiTasks
-import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_EXT_JUNIT
-import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_RULES
-import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_RUNNER
-import static androidx.build.dependencies.DependenciesKt.DEXMAKER_MOCKITO
-import static androidx.build.dependencies.DependenciesKt.MOCKITO_CORE
-import static androidx.build.dependencies.DependenciesKt.TRUTH
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -34,11 +27,11 @@
dependencies {
implementation("androidx.annotation:annotation:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
}
androidx {
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle
index 1de7f62..1b5c379 100644
--- a/window/window-java/build.gradle
+++ b/window/window-java/build.gradle
@@ -28,17 +28,17 @@
}
dependencies {
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_CORE)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesCore)
api(project(":window:window"))
implementation("androidx.core:core:1.3.2")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_KOTLIN, excludes.bytebuddy)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy)
}
androidx {
diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle
index a3160c6..47307edf 100644
--- a/window/window-rxjava2/build.gradle
+++ b/window/window-rxjava2/build.gradle
@@ -35,20 +35,20 @@
}
dependencies {
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_CORE)
- api(KOTLIN_COROUTINES_RX2)
- api(RX_JAVA)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesCore)
+ api(libs.kotlinCoroutinesRx2)
+ api(libs.rxjava2)
api(project(":window:window"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_KOTLIN, excludes.bytebuddy)
- androidTestImplementation(KOTLIN_COROUTINES_TEST)
- androidTestImplementation(MULTIDEX)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy)
+ androidTestImplementation(libs.kotlinCoroutinesTest)
+ androidTestImplementation(libs.multidex)
}
androidx {
diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle
index 7ef3933..84e67ad 100644
--- a/window/window-rxjava3/build.gradle
+++ b/window/window-rxjava3/build.gradle
@@ -34,20 +34,20 @@
}
dependencies {
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_CORE)
- api(KOTLIN_COROUTINES_RX3)
- api(RX_JAVA3)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesCore)
+ api(libs.kotlinCoroutinesRx3)
+ api(libs.rxjava3)
api(project(":window:window"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_KOTLIN, excludes.bytebuddy)
- androidTestImplementation(KOTLIN_COROUTINES_TEST)
- androidTestImplementation(MULTIDEX)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy)
+ androidTestImplementation(libs.kotlinCoroutinesTest)
+ androidTestImplementation(libs.multidex)
}
androidx {
diff --git a/window/window-samples/build.gradle b/window/window-samples/build.gradle
index fa59bfc..062d89b 100644
--- a/window/window-samples/build.gradle
+++ b/window/window-samples/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
diff --git a/window/window/build.gradle b/window/window/build.gradle
index cfb74ad..382e4f41 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -19,8 +19,6 @@
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -46,8 +44,8 @@
}
dependencies {
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_ANDROID)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesAndroid)
implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.1.0")
implementation("androidx.core:core:1.3.2")
@@ -55,26 +53,26 @@
compileOnly(project(":window:window-extensions"))
compileOnly(project(":window:window-sidecar"))
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(MOCKITO_CORE)
- testImplementation(MOCKITO_KOTLIN)
- testImplementation(KOTLIN_COROUTINES_TEST)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.kotlinCoroutinesTest)
testImplementation(compileOnly(project(":window:window-extensions")))
testImplementation(compileOnly(project(":window:window-sidecar")))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(MOCKITO_KOTLIN, excludes.bytebuddy)
- androidTestImplementation(KOTLIN_COROUTINES_TEST)
- androidTestImplementation(MULTIDEX)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.mockitoKotlin, excludes.bytebuddy)
+ androidTestImplementation(libs.kotlinCoroutinesTest)
+ androidTestImplementation(libs.multidex)
+ androidTestImplementation(libs.truth)
androidTestImplementation(compileOnly(project(":window:window-extensions")))
androidTestImplementation(compileOnly(project(":window:window-sidecar")))
}
