Merge "Migrate a miscellaneous set of libraries to Gradle version catalogs" into androidx-main
diff --git a/annotation/annotation-experimental-lint/build.gradle b/annotation/annotation-experimental-lint/build.gradle
index 17d9220..517db7f 100644
--- a/annotation/annotation-experimental-lint/build.gradle
+++ b/annotation/annotation-experimental-lint/build.gradle
@@ -17,9 +17,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
import androidx.build.LibraryVersions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-import static androidx.build.dependencies.DependenciesKt.*
plugins {
id("AndroidXPlugin")
@@ -34,13 +31,13 @@
}
dependencies {
- compileOnly(LINT_API_MIN)
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.androidLintMinApi)
+ compileOnly(libs.kotlinStdlib)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(LINT_CORE)
- testImplementation(LINT_TESTS)
- testImplementation(JUNIT)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.androidLint)
+ testImplementation(libs.androidLintTests)
+ testImplementation(libs.junit)
}
androidx {
diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle
index 99a9bf2..fb5f92a 100644
--- a/annotation/annotation-experimental-lint/integration-tests/build.gradle
+++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle
@@ -16,8 +16,6 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.KOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -25,7 +23,7 @@
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":annotation:annotation-experimental"))
}
diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle
index 2ff61bb..1c16de4 100644
--- a/annotation/annotation-experimental/build.gradle
+++ b/annotation/annotation-experimental/build.gradle
@@ -18,8 +18,6 @@
import androidx.build.LibraryVersions
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -27,7 +25,7 @@
}
dependencies {
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.kotlinStdlib)
lintPublish(project(":annotation:annotation-experimental-lint"))
}
diff --git a/annotation/annotation-sampled/build.gradle b/annotation/annotation-sampled/build.gradle
index fb71b74..d450e7e 100644
--- a/annotation/annotation-sampled/build.gradle
+++ b/annotation/annotation-sampled/build.gradle
@@ -14,15 +14,11 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
-import androidx.build.Publish
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
diff --git a/arch/core/core-common/build.gradle b/arch/core/core-common/build.gradle
index d02da56..fca66dd 100644
--- a/arch/core/core-common/build.gradle
+++ b/arch/core/core-common/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,8 +25,8 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- testImplementation(JUNIT)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.junit)
+ testImplementation(libs.mockitoCore)
}
androidx {
diff --git a/arch/core/core-runtime/build.gradle b/arch/core/core-runtime/build.gradle
index 9459162..89e0b18 100644
--- a/arch/core/core-runtime/build.gradle
+++ b/arch/core/core-runtime/build.gradle
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.AndroidXExtension
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/arch/core/core-testing/build.gradle b/arch/core/core-testing/build.gradle
index af6d38f..4a86ad7 100644
--- a/arch/core/core-testing/build.gradle
+++ b/arch/core/core-testing/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,16 +25,16 @@
dependencies {
api(project(":arch:core:core-runtime"))
api("androidx.annotation:annotation:1.1.0")
- api(JUNIT)
- api(MOCKITO_CORE, excludes.bytebuddy)
+ api(libs.junit)
+ api(libs.mockitoCore, excludes.bytebuddy)
- testImplementation(JUNIT)
+ testImplementation(libs.junit)
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
}
androidx {
diff --git a/asynclayoutinflater/asynclayoutinflater/build.gradle b/asynclayoutinflater/asynclayoutinflater/build.gradle
index 9d560a7..839d5b1 100644
--- a/asynclayoutinflater/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle
index c6b4e56..6379a81 100644
--- a/autofill/autofill/build.gradle
+++ b/autofill/autofill/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -28,11 +26,11 @@
dependencies {
implementation("androidx.core:core:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
androidTestImplementation("junit:junit:4.12")
}
diff --git a/cardview/cardview/build.gradle b/cardview/cardview/build.gradle
index 8cf7e02..163a152 100644
--- a/cardview/cardview/build.gradle
+++ b/cardview/cardview/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/collection/collection-benchmark/build.gradle b/collection/collection-benchmark/build.gradle
index 0e8855c..8e1681e 100644
--- a/collection/collection-benchmark/build.gradle
+++ b/collection/collection-benchmark/build.gradle
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
+
import androidx.build.Publish
plugins {
@@ -28,13 +26,13 @@
dependencies {
androidTestImplementation(project(":collection:collection"))
androidTestImplementation(project(":collection:collection-ktx"))
- androidTestImplementation(KOTLIN_STDLIB)
+ androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(project(":benchmark:benchmark-junit4"))
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
androidx {
diff --git a/collection/collection-ktx/build.gradle b/collection/collection-ktx/build.gradle
index b9a9230..d161552 100644
--- a/collection/collection-ktx/build.gradle
+++ b/collection/collection-ktx/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -26,9 +24,9 @@
dependencies {
api(project(":collection:collection"))
- api(KOTLIN_STDLIB)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ api(libs.kotlinStdlib)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
testImplementation(project(":internal-testutils-truth"))
}
diff --git a/collection/collection/build.gradle b/collection/collection/build.gradle
index e8acec8..0692fa8 100644
--- a/collection/collection/build.gradle
+++ b/collection/collection/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -27,10 +25,10 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- annotationProcessor(NULLAWAY)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ annotationProcessor(libs.nullaway)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
androidx {
diff --git a/collection/collection2/build.gradle b/collection/collection2/build.gradle
index 2960a65..62f7c17 100644
--- a/collection/collection2/build.gradle
+++ b/collection/collection2/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("org.jetbrains.kotlin.multiplatform")
@@ -29,12 +27,12 @@
sourceSets {
commonMain {
dependencies {
- api(KOTLIN_STDLIB_COMMON)
+ api(libs.kotlinStdlibCommon)
}
}
jvmMain {
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
api("androidx.annotation:annotation:1.1.0")
}
}
diff --git a/collection/integration-tests/testapp/build.gradle b/collection/integration-tests/testapp/build.gradle
index 0ff7471..a8d529f 100644
--- a/collection/integration-tests/testapp/build.gradle
+++ b/collection/integration-tests/testapp/build.gradle
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("kotlin")
@@ -26,8 +23,7 @@
dependencies {
implementation(project(":collection:collection"))
- implementation(KOTLIN_STDLIB)
-
+ implementation(libs.kotlinStdlib)
implementation("androidx.annotation:annotation:1.1.0")
}
diff --git a/concurrent/futures-ktx/build.gradle b/concurrent/futures-ktx/build.gradle
index 838f502..8dbb700 100644
--- a/concurrent/futures-ktx/build.gradle
+++ b/concurrent/futures-ktx/build.gradle
@@ -14,15 +14,10 @@
* limitations under the License.
*/
-
-import androidx.build.AndroidXExtension
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
@@ -30,14 +25,14 @@
dependencies {
api(project(":concurrent:concurrent-futures"))
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_CORE)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesCore)
- testImplementation(JUNIT)
- testImplementation(KOTLIN_TEST)
- testImplementation(KOTLIN_COROUTINES_TEST)
- testImplementation(ANDROIDX_TEST_EXT_JUNIT)
- testImplementation(ANDROIDX_TEST_CORE)
+ testImplementation(libs.junit)
+ testImplementation(libs.kotlinTest)
+ testImplementation(libs.kotlinCoroutinesTest)
+ testImplementation(libs.testExtJunit)
+ testImplementation(libs.testCore)
}
androidx {
diff --git a/concurrent/futures/build.gradle b/concurrent/futures/build.gradle
index b1a0910..824efb0 100644
--- a/concurrent/futures/build.gradle
+++ b/concurrent/futures/build.gradle
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.AndroidXExtension
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -27,9 +24,9 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(GUAVA_LISTENABLE_FUTURE)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ api(libs.guavaListenableFuture)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
androidx {
diff --git a/contentpager/contentpager/build.gradle b/contentpager/contentpager/build.gradle
index 17c5064..4e32321 100644
--- a/contentpager/contentpager/build.gradle
+++ b/contentpager/contentpager/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -29,12 +27,12 @@
api("androidx.core:core:1.1.0")
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
}
androidx {
diff --git a/cursoradapter/cursoradapter/build.gradle b/cursoradapter/cursoradapter/build.gradle
index 9ab41a9..aa304ec 100644
--- a/cursoradapter/cursoradapter/build.gradle
+++ b/cursoradapter/cursoradapter/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/customview/customview/build.gradle b/customview/customview/build.gradle
index 1bdb442..f1839fa 100644
--- a/customview/customview/build.gradle
+++ b/customview/customview/build.gradle
@@ -1,4 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.Publish
@@ -13,12 +12,12 @@
api("androidx.core:core:1.3.0-beta01")
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
androidx {
diff --git a/documentfile/documentfile/build.gradle b/documentfile/documentfile/build.gradle
index 4430a1e..10030ef 100644
--- a/documentfile/documentfile/build.gradle
+++ b/documentfile/documentfile/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -11,11 +9,11 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- annotationProcessor(NULLAWAY)
+ annotationProcessor(libs.nullaway)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
}
androidx {
diff --git a/dynamic-animation/dynamic-animation-ktx/build.gradle b/dynamic-animation/dynamic-animation-ktx/build.gradle
index e3ec3f0..d1553c9 100644
--- a/dynamic-animation/dynamic-animation-ktx/build.gradle
+++ b/dynamic-animation/dynamic-animation-ktx/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.Publish
plugins {
@@ -27,17 +25,17 @@
}
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
api(project(":dynamicanimation:dynamicanimation"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
- 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.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
}
androidx {
diff --git a/dynamic-animation/dynamic-animation/build.gradle b/dynamic-animation/dynamic-animation/build.gradle
index 13e952f..50c3e5c 100644
--- a/dynamic-animation/dynamic-animation/build.gradle
+++ b/dynamic-animation/dynamic-animation/build.gradle
@@ -1,4 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
@@ -12,13 +11,13 @@
api("androidx.core:core:1.1.0")
implementation("androidx.collection:collection:1.1.0")
- 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
}
androidx {
diff --git a/enterprise/feedback/build.gradle b/enterprise/feedback/build.gradle
index 8c912a0..6e9a1bb 100644
--- a/enterprise/feedback/build.gradle
+++ b/enterprise/feedback/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -9,13 +7,13 @@
}
dependencies {
api("androidx.annotation:annotation:1.0.1")
- api(AUTO_VALUE_ANNOTATIONS)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- annotationProcessor(AUTO_VALUE)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
+ api(libs.autoValueAnnotations)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ annotationProcessor(libs.autoValue)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
}
android {
defaultConfig {
diff --git a/enterprise/feedback/testing/build.gradle b/enterprise/feedback/testing/build.gradle
index e5bc874..ff1db7c 100644
--- a/enterprise/feedback/testing/build.gradle
+++ b/enterprise/feedback/testing/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -25,7 +23,7 @@
}
dependencies {
api(project(":enterprise-feedback:"))
- testImplementation(TRUTH)
+ testImplementation(libs.truth)
}
android {
defaultConfig {
diff --git a/exifinterface/exifinterface/build.gradle b/exifinterface/exifinterface/build.gradle
index cad2490..ff3abf5 100644
--- a/exifinterface/exifinterface/build.gradle
+++ b/exifinterface/exifinterface/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -11,10 +9,10 @@
dependencies {
implementation("androidx.annotation:annotation:1.2.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
androidx {
diff --git a/gridlayout/gridlayout/build.gradle b/gridlayout/gridlayout/build.gradle
index b5c5616..0d7f10e 100644
--- a/gridlayout/gridlayout/build.gradle
+++ b/gridlayout/gridlayout/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -12,11 +10,11 @@
api("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.3.0-beta01")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
}
androidx {
diff --git a/health/health-services-client/build.gradle b/health/health-services-client/build.gradle
index 248825c..51f8485 100644
--- a/health/health-services-client/build.gradle
+++ b/health/health-services-client/build.gradle
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+
import androidx.build.LibraryGroups
import androidx.build.LibraryType
import androidx.build.LibraryVersions
@@ -25,10 +25,10 @@
}
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
api("androidx.annotation:annotation:1.1.0")
- implementation(GUAVA_LISTENABLE_FUTURE)
- implementation(GUAVA_ANDROID)
+ implementation(libs.guavaListenableFuture)
+ implementation(libs.guavaAndroid)
implementation("androidx.core:core-ktx:1.5.0-alpha04")
}
diff --git a/heifwriter/heifwriter/build.gradle b/heifwriter/heifwriter/build.gradle
index 2df6655..55b7af7 100644
--- a/heifwriter/heifwriter/build.gradle
+++ b/heifwriter/heifwriter/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -17,11 +15,11 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
}
androidx {
diff --git a/interpolator/interpolator/build.gradle b/interpolator/interpolator/build.gradle
index 98ec2fc..6a7c619 100644
--- a/interpolator/interpolator/build.gradle
+++ b/interpolator/interpolator/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/lint-checks/build.gradle b/lint-checks/build.gradle
index 9f72819..00164a2 100644
--- a/lint-checks/build.gradle
+++ b/lint-checks/build.gradle
@@ -32,14 +32,14 @@
}
dependencies {
- compileOnly(LINT_API_LATEST)
+ compileOnly(libs.androidLintApi)
compileOnly(LINT_CHECKS_LATEST)
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.kotlinStdlib)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(LINT_CORE)
- testImplementation(LINT_TESTS)
- testImplementation(JUNIT)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.androidLint)
+ testImplementation(libs.androidLintTests)
+ testImplementation(libs.junit)
}
androidx {
diff --git a/lint-checks/integration-tests/build.gradle b/lint-checks/integration-tests/build.gradle
index 0f79fa8..8b98f67 100644
--- a/lint-checks/integration-tests/build.gradle
+++ b/lint-checks/integration-tests/build.gradle
@@ -16,8 +16,6 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.KOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -26,7 +24,7 @@
dependencies {
implementation(projectOrArtifact(":annotation:annotation"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
// Allow usage of Kotlin's @Experimental and @RequiresOptIn annotations.
diff --git a/lint-demos/lint-demo-appcompat/build.gradle b/lint-demos/lint-demo-appcompat/build.gradle
index bc9e2d70..0f821f9 100644
--- a/lint-demos/lint-demo-appcompat/build.gradle
+++ b/lint-demos/lint-demo-appcompat/build.gradle
@@ -1,5 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.KOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -9,13 +7,12 @@
dependencies {
implementation(project(":appcompat:appcompat"))
implementation(project(":core:core"))
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
}
android {
defaultConfig {
vectorDrawables.useSupportLibrary = true
- minSdkVersion=14
}
lintOptions {
disable "WrongThread"
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle
index 12f8e80..eced1e8 100644
--- a/loader/loader-ktx/build.gradle
+++ b/loader/loader-ktx/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -30,17 +28,17 @@
api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0") {
because "Mirror loader dependency graph for -ktx artifacts"
}
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing"))
- 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
}
androidx {
diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle
index 48be3ec..a663653 100644
--- a/loader/loader/build.gradle
+++ b/loader/loader/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -16,13 +14,13 @@
implementation("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing"))
- 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
}
androidx {
diff --git a/localbroadcastmanager/localbroadcastmanager/build.gradle b/localbroadcastmanager/localbroadcastmanager/build.gradle
index 01409e3..c34098b 100644
--- a/localbroadcastmanager/localbroadcastmanager/build.gradle
+++ b/localbroadcastmanager/localbroadcastmanager/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
index 63348d94..620ce86 100644
--- a/palette/palette-ktx/build.gradle
+++ b/palette/palette-ktx/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -27,11 +25,11 @@
dependencies {
api(project(":palette:palette"))
- api(KOTLIN_STDLIB)
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ api(libs.kotlinStdlib)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
}
androidx {
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
index 4291c4b..8117192 100644
--- a/palette/palette/build.gradle
+++ b/palette/palette/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -12,11 +10,11 @@
api("androidx.core:core:1.1.0")
implementation("androidx.collection:collection:1.1.0")
- annotationProcessor(NULLAWAY)
+ annotationProcessor(libs.nullaway)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
}
androidx {
diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle
index bc6a65e..58db58d 100644
--- a/percentlayout/percentlayout/build.gradle
+++ b/percentlayout/percentlayout/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -12,11 +10,11 @@
api("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
}
android {
diff --git a/placeholder-tests/build.gradle b/placeholder-tests/build.gradle
index 863ce958..f96a629c6 100644
--- a/placeholder-tests/build.gradle
+++ b/placeholder-tests/build.gradle
@@ -14,19 +14,17 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
}
dependencies {
- testImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ testImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
androidx {
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
index ef77225..aee756e 100644
--- a/preference/preference-ktx/build.gradle
+++ b/preference/preference-ktx/build.gradle
@@ -14,11 +14,7 @@
* limitations under the License.
*/
-
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.Publish
plugins {
@@ -35,14 +31,14 @@
api("androidx.fragment:fragment-ktx:1.2.4") {
because "Mirror preference dependency graph for -ktx artifacts"
}
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":internal-testutils-truth"))
}
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
index 766ba71..49a29bf 100644
--- a/preference/preference/build.gradle
+++ b/preference/preference/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -34,16 +32,16 @@
api("androidx.fragment:fragment:1.2.4")
api("androidx.recyclerview:recyclerview:1.0.0")
- 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(KOTLIN_STDLIB)
- androidTestImplementation(TRUTH)
- androidTestImplementation(MULTIDEX)
+ 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(libs.kotlinStdlib)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.multidex)
}
android {
diff --git a/print/print/build.gradle b/print/print/build.gradle
index 5b663ae..2b1b2e0 100644
--- a/print/print/build.gradle
+++ b/print/print/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
index 411e5df..f97eac2 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -33,6 +31,6 @@
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":profileinstaller:profileinstaller"))
}
diff --git a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
index 33e00c2..ce6d30f 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
+++ b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle
@@ -14,13 +14,6 @@
* limitations under the License.
*/
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryGroups
-import androidx.build.Publish
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -37,10 +30,10 @@
androidTestImplementation(project(":profileinstaller:profileinstaller"))
androidTestImplementation(project(":benchmark:benchmark-macro-junit4"))
androidTestImplementation(project(":internal-testutils-macrobenchmark"))
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
}
def installReleaseTarget = tasks.getByPath(
diff --git a/profileinstaller/integration-tests/testapp/build.gradle b/profileinstaller/integration-tests/testapp/build.gradle
index ed77236..7133f18 100644
--- a/profileinstaller/integration-tests/testapp/build.gradle
+++ b/profileinstaller/integration-tests/testapp/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("AndroidXUiPlugin")
@@ -26,7 +24,7 @@
dependencies {
kotlinPlugin(project(":compose:compiler:compiler"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":compose:androidview:androidview"))
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:foundation:foundation-layout"))
@@ -35,11 +33,11 @@
implementation(project(":compose:runtime:runtime"))
implementation(project(":compose:ui:ui"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":activity:activity-compose"))
implementation(project(":profileinstaller:profileinstaller"))
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.testRunner)
}
android {
@@ -50,9 +48,6 @@
checkReleaseBuilds false
}
buildTypes {
- debug {
-
- }
release {
minifyEnabled true
}
diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle
index e4dd92d..d49dd89 100644
--- a/profileinstaller/profileinstaller-benchmark/build.gradle
+++ b/profileinstaller/profileinstaller-benchmark/build.gradle
@@ -17,8 +17,6 @@
import androidx.build.LibraryGroups
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -29,15 +27,15 @@
dependencies {
androidTestImplementation(project(":profileinstaller:profileinstaller"))
androidTestImplementation(projectOrArtifact(":benchmark:benchmark-junit4"))
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ 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-runtime')
- androidTestImplementation(KOTLIN_STDLIB)
+ androidTestImplementation(libs.kotlinStdlib)
}
androidx {
diff --git a/profileinstaller/profileinstaller/build.gradle b/profileinstaller/profileinstaller/build.gradle
index e939335..5fdef63 100644
--- a/profileinstaller/profileinstaller/build.gradle
+++ b/profileinstaller/profileinstaller/build.gradle
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+
import androidx.build.LibraryGroups
import androidx.build.LibraryType
import androidx.build.LibraryVersions
@@ -24,11 +24,11 @@
}
dependencies {
- annotationProcessor(NULLAWAY)
+ annotationProcessor(libs.nullaway)
api("androidx.startup:startup-runtime:1.0.0")
implementation("androidx.annotation:annotation:1.2.0")
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
androidx {
diff --git a/recommendation/recommendation/build.gradle b/recommendation/recommendation/build.gradle
index e6702ce..041450c 100644
--- a/recommendation/recommendation/build.gradle
+++ b/recommendation/recommendation/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
diff --git a/remotecallback/processor/build.gradle b/remotecallback/processor/build.gradle
index a5d387f..de0f94a 100644
--- a/remotecallback/processor/build.gradle
+++ b/remotecallback/processor/build.gradle
@@ -17,8 +17,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import static androidx.build.dependencies.DependenciesKt.JAVAPOET
-
plugins {
id("AndroidXPlugin")
id("java-library")
@@ -26,7 +24,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- implementation(JAVAPOET)
+ implementation(libs.javapoet)
}
androidx {
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle
index a0ad9c0..284e75f 100644
--- a/remotecallback/remotecallback/build.gradle
+++ b/remotecallback/remotecallback/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.Publish
plugins {
@@ -29,11 +26,11 @@
api("androidx.annotation:annotation:1.1.0")
implementation(project(":collection:collection"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
androidTestAnnotationProcessor (project(":remotecallback:remotecallback-processor"))
}
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index ca6caec..ee14a35 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -1,5 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -16,6 +14,6 @@
implementation(project(":fragment:fragment-ktx"))
implementation(project(":media:media"))
implementation(project(":viewpager:viewpager"))
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinCoroutinesAndroid)
}
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 6076b36..22f0706 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -1,6 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.KOTLIN_STDLIB
-import static androidx.build.dependencies.DependenciesKt.MATERIAL
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -8,7 +5,7 @@
}
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
implementation(project(":appcompat:appcompat"))
implementation(project(":cardview:cardview"))
implementation(project(":drawerlayout:drawerlayout"))
@@ -18,7 +15,7 @@
implementation(project(":recyclerview:recyclerview"))
implementation(project(":recyclerview:recyclerview-selection"))
implementation("androidx.concurrent:concurrent-futures:1.1.0")
- api(MATERIAL)
+ api(libs.material)
}
android {
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index 515838b..dd39ef8 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2017 The Android Open Source Project
*
@@ -15,15 +14,13 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.MATERIAL
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
}
dependencies {
- implementation(MATERIAL)
+ implementation(libs.material)
implementation(project(":transition:transition"))
implementation(project(":recyclerview:recyclerview"))
implementation(project(":appcompat:appcompat"))
@@ -32,10 +29,3 @@
implementation(project(":coordinatorlayout:coordinatorlayout"))
implementation(project(":core:core"))
}
-
-android {
- defaultConfig {
- applicationId "com.example.androidx.contentpager.content.demos"
- minSdkVersion 14
- }
-}
diff --git a/samples/SupportRemoteCallbackDemos/build.gradle b/samples/SupportRemoteCallbackDemos/build.gradle
index e5a97e9..f35b59c 100644
--- a/samples/SupportRemoteCallbackDemos/build.gradle
+++ b/samples/SupportRemoteCallbackDemos/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -25,12 +23,11 @@
implementation(project(":remotecallback:remotecallback"))
implementation(project(":recyclerview:recyclerview"))
implementation(project(":appcompat:appcompat"))
- annotationProcessor project(":remotecallback:remotecallback-processor")
+ annotationProcessor(project(":remotecallback:remotecallback-processor"))
}
android {
defaultConfig {
minSdkVersion 19
- applicationId "com.example.androidx.remotecallback.demos"
}
}
diff --git a/samples/SupportSliceDemos/build.gradle b/samples/SupportSliceDemos/build.gradle
index 25d3955..992ff53 100644
--- a/samples/SupportSliceDemos/build.gradle
+++ b/samples/SupportSliceDemos/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -36,6 +34,5 @@
android {
defaultConfig {
minSdkVersion 19
- applicationId "com.example.androidx.slice.demos"
}
}
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
index 2529c48..9be2491 100644
--- a/savedstate/savedstate-ktx/build.gradle
+++ b/savedstate/savedstate-ktx/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.Publish
@@ -26,12 +25,12 @@
dependencies {
api(project(":savedstate:savedstate"))
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
}
androidx {
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
index df5ca59..6b1280f 100644
--- a/savedstate/savedstate/build.gradle
+++ b/savedstate/savedstate/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -20,13 +18,13 @@
implementation("androidx.arch.core:core-common:2.0.1")
implementation("androidx.lifecycle:lifecycle-common:2.0.0")
- androidTestImplementation(KOTLIN_STDLIB)
+ androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation("androidx.lifecycle:lifecycle-runtime:2.0.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
}
androidx {
diff --git a/security/crypto/build.gradle b/security/crypto/build.gradle
index 665ee42..5ac6cfe 100644
--- a/security/crypto/build.gradle
+++ b/security/crypto/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
diff --git a/security/identity-credential/build.gradle b/security/identity-credential/build.gradle
index 677731a..4c3cd86 100644
--- a/security/identity-credential/build.gradle
+++ b/security/identity-credential/build.gradle
@@ -19,8 +19,6 @@
import androidx.build.Publish
import androidx.build.RunApiTasks
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -34,11 +32,11 @@
implementation("org.bouncycastle:bcprov-jdk15on:1.65")
implementation("org.bouncycastle:bcpkix-jdk15on:1.56")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(MOCKITO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.mockitoCore)
}
android {
diff --git a/security/security-app-authenticator-testing/build.gradle b/security/security-app-authenticator-testing/build.gradle
index 5d92e64..4bee868 100644
--- a/security/security-app-authenticator-testing/build.gradle
+++ b/security/security-app-authenticator-testing/build.gradle
@@ -13,15 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.LibraryType
-import androidx.build.Publish
-
-import static androidx.build.dependencies.DependenciesKt.ANDROIDX_TEST_CORE
-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
plugins {
id("AndroidXPlugin")
@@ -33,10 +28,10 @@
implementation("androidx.collection:collection:1.1.0")
androidTestImplementation("junit:junit:4.13")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
android {
diff --git a/security/security-app-authenticator/build.gradle b/security/security-app-authenticator/build.gradle
index 186da78..e74c0c0 100644
--- a/security/security-app-authenticator/build.gradle
+++ b/security/security-app-authenticator/build.gradle
@@ -14,12 +14,9 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.LibraryType
-import androidx.build.Publish
plugins {
id("AndroidXPlugin")
@@ -28,23 +25,23 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- implementation(AUTO_VALUE_ANNOTATIONS)
- annotationProcessor(AUTO_VALUE)
+ implementation(libs.autoValueAnnotations)
+ annotationProcessor(libs.autoValue)
implementation("androidx.collection:collection:1.1.0")
testImplementation("junit:junit:4.13")
- testImplementation(ANDROIDX_TEST_EXT_JUNIT)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(ANDROIDX_TEST_RULES)
- testImplementation(MOCKITO_CORE)
- testImplementation(ROBOLECTRIC)
+ testImplementation(libs.testExtJunit)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.testRules)
+ testImplementation(libs.mockitoCore)
+ testImplementation(libs.robolectric)
androidTestImplementation("junit:junit:4.13")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
android {
diff --git a/security/security-biometric/build.gradle b/security/security-biometric/build.gradle
index bbaacbf..853e684 100644
--- a/security/security-biometric/build.gradle
+++ b/security/security-biometric/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
@@ -30,11 +29,11 @@
implementation("com.google.crypto.tink:tink-android:1.3.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(MOCKITO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.mockitoCore)
}
diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle
index f977990..a2ff661 100644
--- a/security/security-crypto-ktx/build.gradle
+++ b/security/security-crypto-ktx/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
diff --git a/sharetarget/sharetarget/build.gradle b/sharetarget/sharetarget/build.gradle
index e911dca..8ef5b8a 100644
--- a/sharetarget/sharetarget/build.gradle
+++ b/sharetarget/sharetarget/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -27,15 +25,15 @@
dependencies {
api("androidx.core:core:1.3.2")
api("androidx.collection:collection:1.1.0")
- api(GUAVA_LISTENABLE_FUTURE)
+ api(libs.guavaListenableFuture)
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- 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.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker
}
androidx {
diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle
index 59ce01d..c9f27d1 100644
--- a/startup/integration-tests/first-library/build.gradle
+++ b/startup/integration-tests/first-library/build.gradle
@@ -14,26 +14,22 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
id("kotlin-android")
}
-project.ext.noDocs = true
-
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
implementation(project(":startup:startup-runtime"))
implementation(project(":work:work-runtime-ktx"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has its own MockMaker
- testImplementation(JUNIT)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
+ testImplementation(libs.junit)
}
diff --git a/startup/integration-tests/second-library/build.gradle b/startup/integration-tests/second-library/build.gradle
index 760958b..2102ffe 100644
--- a/startup/integration-tests/second-library/build.gradle
+++ b/startup/integration-tests/second-library/build.gradle
@@ -14,25 +14,21 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
id("kotlin-android")
}
-project.ext.noDocs = true
-
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
implementation(project(":startup:startup-runtime"))
implementation(project(":startup:integration-tests:first-library"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has its own MockMaker
- testImplementation(JUNIT)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
+ testImplementation(libs.junit)
}
diff --git a/startup/integration-tests/test-app/build.gradle b/startup/integration-tests/test-app/build.gradle
index c6ca6df..833c186 100644
--- a/startup/integration-tests/test-app/build.gradle
+++ b/startup/integration-tests/test-app/build.gradle
@@ -22,8 +22,6 @@
id("kotlin-android")
}
-project.ext.noDocs = true
-
android {
buildTypes {
getByName("release") {
@@ -33,7 +31,7 @@
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":startup:integration-tests:first-library"))
implementation(project(":startup:integration-tests:second-library"))
implementation(CONSTRAINT_LAYOUT, { transitive = true })
diff --git a/startup/startup-runtime-lint/build.gradle b/startup/startup-runtime-lint/build.gradle
index 22a35542..a5e584b 100644
--- a/startup/startup-runtime-lint/build.gradle
+++ b/startup/startup-runtime-lint/build.gradle
@@ -17,21 +17,19 @@
import androidx.build.LibraryType
import androidx.build.LibraryVersions
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- compileOnly(LINT_API_MIN)
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.androidLintMinApi)
+ compileOnly(libs.kotlinStdlib)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(LINT_CORE)
- testImplementation(LINT_TESTS)
- testImplementation(JUNIT)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.androidLint)
+ testImplementation(libs.androidLintTests)
+ testImplementation(libs.junit)
}
androidx {
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle
index 315f1ee..2e98baa 100644
--- a/startup/startup-runtime/build.gradle
+++ b/startup/startup-runtime/build.gradle
@@ -14,13 +14,9 @@
* limitations under the License.
*/
-
-import androidx.build.AndroidXExtension
import androidx.build.LibraryGroups
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -37,14 +33,14 @@
implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.tracing:tracing:1.0.0")
lintPublish(project(":startup:startup-runtime-lint"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has its own MockMaker
- testImplementation(JUNIT)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
+ testImplementation(libs.junit)
}
androidx {
diff --git a/test/screenshot/build.gradle b/test/screenshot/build.gradle
index d3769c3..08a239a 100644
--- a/test/screenshot/build.gradle
+++ b/test/screenshot/build.gradle
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
plugins {
id("AndroidXPlugin")
@@ -29,15 +27,15 @@
implementation("androidx.core:core:1.5.0-rc02")
implementation("androidx.test.screenshot:screenshot-proto:1.0.0-alpha01")
- implementation(KOTLIN_STDLIB)
- implementation(JUNIT)
- implementation(ANDROIDX_TEST_RULES)
- implementation(ANDROIDX_TEST_RUNNER)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.junit)
+ implementation(libs.testRules)
+ implementation(libs.testRunner)
- androidTestImplementation(TRUTH)
- androidTestImplementation(JUNIT)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
}
androidx {
diff --git a/test/screenshot/proto/build.gradle b/test/screenshot/proto/build.gradle
index 48aa430..1d323a9 100644
--- a/test/screenshot/proto/build.gradle
+++ b/test/screenshot/proto/build.gradle
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.BuildServerConfigurationKt
plugins {
@@ -24,7 +23,7 @@
apply(plugin: "com.google.protobuf")
dependencies {
- implementation(PROTOBUF)
+ implementation(libs.protobuf)
}
tasks.withType(Jar) {
diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle
index afd9243..ee9a25e 100644
--- a/testutils/testutils-appcompat/build.gradle
+++ b/testutils/testutils-appcompat/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -27,10 +25,10 @@
api(project(":appcompat:appcompat"))
api(project(":annotation:annotation-experimental"))
- implementation(ANDROIDX_TEST_EXT_JUNIT)
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.testExtJunit)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
+ implementation(libs.kotlinStdlib)
}
android {
diff --git a/testutils/testutils-common/build.gradle b/testutils/testutils-common/build.gradle
index bd13e75..bea9428 100644
--- a/testutils/testutils-common/build.gradle
+++ b/testutils/testutils-common/build.gradle
@@ -14,13 +14,11 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
diff --git a/testutils/testutils-espresso/build.gradle b/testutils/testutils-espresso/build.gradle
index 314bef2..57507bf 100644
--- a/testutils/testutils-espresso/build.gradle
+++ b/testutils/testutils-espresso/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -25,8 +23,8 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- implementation(ESPRESSO_CORE, excludes.espresso)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.espressoCore, excludes.espresso)
+ implementation(libs.kotlinStdlib)
}
android {
diff --git a/testutils/testutils-gradle-plugin/build.gradle b/testutils/testutils-gradle-plugin/build.gradle
index ad82bed..127a4bf 100644
--- a/testutils/testutils-gradle-plugin/build.gradle
+++ b/testutils/testutils-gradle-plugin/build.gradle
@@ -14,16 +14,14 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- implementation(KOTLIN_STDLIB)
- implementation(ANDROIDX_TEST_EXT_JUNIT)
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.testExtJunit)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
}
diff --git a/testutils/testutils-ktx/build.gradle b/testutils/testutils-ktx/build.gradle
index 016b815..eda09a6 100644
--- a/testutils/testutils-ktx/build.gradle
+++ b/testutils/testutils-ktx/build.gradle
@@ -14,21 +14,18 @@
* limitations under the License.
*/
-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- api(KOTLIN_STDLIB)
- api(KOTLIN_COROUTINES_CORE)
- api(KOTLIN_COROUTINES_TEST)
- api(JUNIT)
+ api(libs.kotlinStdlib)
+ api(libs.kotlinCoroutinesCore)
+ api(libs.kotlinCoroutinesTest)
+ api(libs.junit)
}
// Allow usage of Kotlin's @OptIn.
diff --git a/testutils/testutils-macrobenchmark/build.gradle b/testutils/testutils-macrobenchmark/build.gradle
index d331ce5..c4a95da 100644
--- a/testutils/testutils-macrobenchmark/build.gradle
+++ b/testutils/testutils-macrobenchmark/build.gradle
@@ -14,11 +14,6 @@
* limitations under the License.
*/
-
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -29,7 +24,7 @@
implementation(project(":benchmark:benchmark-macro"))
implementation(project(":benchmark:benchmark-macro-junit4"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
android {
diff --git a/testutils/testutils-mockito/build.gradle b/testutils/testutils-mockito/build.gradle
index 7582ccd..40d784c 100644
--- a/testutils/testutils-mockito/build.gradle
+++ b/testutils/testutils-mockito/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -23,9 +21,9 @@
}
dependencies {
- api(MOCKITO_CORE, excludes.bytebuddy)
+ api(libs.mockitoCore, excludes.bytebuddy)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
android {
diff --git a/testutils/testutils-navigation/build.gradle b/testutils/testutils-navigation/build.gradle
index 61664a7..6e705df 100644
--- a/testutils/testutils-navigation/build.gradle
+++ b/testutils/testutils-navigation/build.gradle
@@ -14,12 +14,6 @@
* 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 {
id("AndroidXPlugin")
id("com.android.library")
@@ -31,11 +25,11 @@
testImplementation(projectOrArtifact(":navigation:navigation-testing"))
testImplementation("androidx.arch.core:core-testing:2.1.0")
- testImplementation(JUNIT)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.junit)
+ testImplementation(libs.mockitoCore)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
}
diff --git a/testutils/testutils-paging/build.gradle b/testutils/testutils-paging/build.gradle
index 7d242fa..cef3497 100644
--- a/testutils/testutils-paging/build.gradle
+++ b/testutils/testutils-paging/build.gradle
@@ -14,21 +14,17 @@
* limitations under the License.
*/
-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_TEST
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
implementation(project(":paging:paging-common"))
- implementation(KOTLIN_TEST)
+ implementation(libs.kotlinTest)
}
// Allow usage of Kotlin's @OptIn.
diff --git a/testutils/testutils-runtime/build.gradle b/testutils/testutils-runtime/build.gradle
index d315b6a..795f410 100644
--- a/testutils/testutils-runtime/build.gradle
+++ b/testutils/testutils-runtime/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -25,10 +23,10 @@
dependencies {
api("androidx.fragment:fragment:1.1.0")
- implementation(ANDROIDX_TEST_EXT_JUNIT)
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.testExtJunit)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
+ implementation(libs.kotlinStdlib)
}
android {
diff --git a/testutils/testutils-truth/build.gradle b/testutils/testutils-truth/build.gradle
index 617d787..2c984ec 100644
--- a/testutils/testutils-truth/build.gradle
+++ b/testutils/testutils-truth/build.gradle
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- api(TRUTH)
- api(KOTLIN_STDLIB)
+ api(libs.truth)
+ api(libs.kotlinStdlib)
}
diff --git a/textclassifier/integration-tests/testapp/build.gradle b/textclassifier/integration-tests/testapp/build.gradle
index fcbe262..172072c 100644
--- a/textclassifier/integration-tests/testapp/build.gradle
+++ b/textclassifier/integration-tests/testapp/build.gradle
@@ -14,15 +14,11 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
}
-project.ext.noDocs = true
-
android {
buildTypes {
getByName("release") {
@@ -36,10 +32,10 @@
dependencies {
implementation(project(":textclassifier:textclassifier"))
implementation(project(":core:core"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore)
}
diff --git a/textclassifier/textclassifier/build.gradle b/textclassifier/textclassifier/build.gradle
index bc5aabc..312925a 100644
--- a/textclassifier/textclassifier/build.gradle
+++ b/textclassifier/textclassifier/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -14,20 +12,14 @@
implementation("androidx.collection:collection:1.0.0")
api("androidx.core:core:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy)
-}
-
-android {
- defaultConfig {
- minSdkVersion 14
- }
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
}
androidx {
diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle
index cb19a01..49ef937 100644
--- a/tracing/tracing-ktx/build.gradle
+++ b/tracing/tracing-ktx/build.gradle
@@ -14,12 +14,7 @@
* limitations under the License.
*/
-
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension
-
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.Publish
plugins {
@@ -30,13 +25,13 @@
dependencies {
api project(":tracing:tracing")
- api(KOTLIN_STDLIB)
+ api(libs.kotlinStdlib)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- testImplementation(JUNIT)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ testImplementation(libs.junit)
}
androidx {
diff --git a/tracing/tracing/build.gradle b/tracing/tracing/build.gradle
index 7582a61..2f85b8b 100644
--- a/tracing/tracing/build.gradle
+++ b/tracing/tracing/build.gradle
@@ -14,12 +14,7 @@
* limitations under the License.
*/
-
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension
-
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.Publish
plugins {
@@ -30,11 +25,11 @@
dependencies {
implementation("androidx.annotation:annotation:1.2.0")
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ testImplementation(libs.junit)
}
androidx {
diff --git a/tv-provider/tv-provider/build.gradle b/tv-provider/tv-provider/build.gradle
index c3a6147..5efa09e 100644
--- a/tv-provider/tv-provider/build.gradle
+++ b/tv-provider/tv-provider/build.gradle
@@ -1,6 +1,4 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -12,11 +10,11 @@
api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(MOCKITO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.mockitoCore)
}
android {
diff --git a/vectordrawable/vectordrawable-animated/build.gradle b/vectordrawable/vectordrawable-animated/build.gradle
index e0a2582..7d7723a2 100644
--- a/vectordrawable/vectordrawable-animated/build.gradle
+++ b/vectordrawable/vectordrawable-animated/build.gradle
@@ -1,4 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
@@ -13,11 +12,11 @@
implementation("androidx.interpolator:interpolator:1.0.0")
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
}
android {
diff --git a/vectordrawable/vectordrawable-seekable/build.gradle b/vectordrawable/vectordrawable-seekable/build.gradle
index b40844f..6367a75 100644
--- a/vectordrawable/vectordrawable-seekable/build.gradle
+++ b/vectordrawable/vectordrawable-seekable/build.gradle
@@ -1,4 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
@@ -13,12 +12,12 @@
api(project(":core:core-animation"))
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ESPRESSO_CORE, excludes.espresso)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.espressoCore, excludes.espresso)
androidTestImplementation(project(":core:core-animation-testing"))
}
diff --git a/vectordrawable/vectordrawable/build.gradle b/vectordrawable/vectordrawable/build.gradle
index 9805e43..03d5136 100644
--- a/vectordrawable/vectordrawable/build.gradle
+++ b/vectordrawable/vectordrawable/build.gradle
@@ -1,4 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
@@ -13,10 +12,10 @@
api("androidx.core:core:1.1.0")
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
}
android {
