Migrate the rest of compose to version catalogs
There only pending thing is uses of SKIKO.
Test: ./gradlew tasks
Change-Id: I28068cfe9d8cf834ccf05c8a55657bb8acf0d658
diff --git a/compose/animation/animation-tooling-internal/build.gradle b/compose/animation/animation-tooling-internal/build.gradle
index b92dd31..413005a 100644
--- a/compose/animation/animation-tooling-internal/build.gradle
+++ b/compose/animation/animation-tooling-internal/build.gradle
@@ -15,19 +15,16 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
-import static androidx.build.dependencies.DependenciesKt.getKOTLIN_STDLIB
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
}
androidx {
diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle
index 192f542..26c147d 100644
--- a/compose/benchmark-utils/benchmark/build.gradle
+++ b/compose/benchmark-utils/benchmark/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -31,8 +29,8 @@
androidTestImplementation project(":compose:benchmark-utils")
androidTestImplementation project(":compose:runtime:runtime")
androidTestImplementation project(":compose:foundation:foundation-layout")
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_TEST_COMMON)
- androidTestImplementation(JUNIT)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinTestCommon)
+ androidTestImplementation(libs.junit)
}
diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle
index e974d88..474cc27 100644
--- a/compose/benchmark-utils/build.gradle
+++ b/compose/benchmark-utils/build.gradle
@@ -14,11 +14,6 @@
* limitations under the License.
*/
-
-import androidx.build.AndroidXComposePlugin
-
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -33,10 +28,10 @@
api(project(":compose:test-utils"))
api(project(":benchmark:benchmark-junit4"))
- implementation(KOTLIN_STDLIB_COMMON)
+ implementation(libs.kotlinStdlibCommon)
implementation(project(":compose:runtime:runtime"))
implementation(project(":compose:ui:ui"))
- implementation(ANDROIDX_TEST_RULES)
+ implementation(libs.testRules)
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle
index 950f03e..0928c97 100644
--- a/compose/desktop/desktop/build.gradle
+++ b/compose/desktop/desktop/build.gradle
@@ -21,7 +21,11 @@
import androidx.build.SupportConfigKt
import static androidx.build.AndroidXPlugin.BUILD_ON_SERVER_TASK
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.SKIKO_CURRENT_OS
+import static androidx.build.dependencies.DependenciesKt.SKIKO_LINUX_X64
+import static androidx.build.dependencies.DependenciesKt.SKIKO_MACOS_X64
+import static androidx.build.dependencies.DependenciesKt.SKIKO_MACOS_ARM64
+import static androidx.build.dependencies.DependenciesKt.SKIKO_WINDOWS_X64
plugins {
id("AndroidXPlugin")
@@ -40,7 +44,7 @@
sourceSets {
commonMain.dependencies {
- implementation(KOTLIN_STDLIB_COMMON)
+ implementation(libs.kotlinStdlibCommon)
implementation(project(":compose:ui:ui-util"))
api(project(":compose:foundation:foundation"))
api(project(":compose:material:material"))
@@ -49,20 +53,20 @@
}
jvmMain.dependencies {
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_STDLIB_JDK8)
- implementation(KOTLIN_COROUTINES_CORE)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinStdlibJdk8)
+ implementation(libs.kotlinCoroutinesCore)
}
jvmTest {
resources.srcDirs += new File(SupportConfigKt.getExternalProjectPath(project), "noto-fonts/other/")
resources.srcDirs += "src/jvmTest/res"
dependencies {
- implementation(KOTLIN_COROUTINES_TEST)
+ implementation(libs.kotlinCoroutinesTest)
implementation(SKIKO_CURRENT_OS)
implementation(project(":compose:ui:ui-test-junit4"))
- implementation(JUNIT)
- implementation(TRUTH)
+ implementation(libs.junit)
+ implementation(libs.truth)
}
}
}
diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle
index c63caf5..35cfa6f 100644
--- a/compose/desktop/desktop/samples/build.gradle
+++ b/compose/desktop/desktop/samples/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.SupportConfigKt
import static androidx.build.AndroidXPlugin.BUILD_ON_SERVER_TASK
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.SKIKO_CURRENT_OS
plugins {
id("AndroidXPlugin")
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 6d118b9..00e53eb 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -1,5 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("AndroidXComposePlugin")
@@ -17,8 +15,8 @@
implementation(project(":navigation:navigation-compose:integration-tests:navigation-demos"))
implementation(project(":compose:ui:ui:integration-tests:ui-demos"))
- implementation(KOTLIN_REFLECT)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinReflect)
+ implementation(libs.kotlinStdlib)
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:foundation:foundation-layout"))
@@ -30,12 +28,12 @@
implementation("androidx.preference:preference-ktx:1.1.1")
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(JUNIT)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.truth)
}
android {
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index 92db590..393d58f 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("AndroidXComposePlugin")
@@ -25,7 +23,7 @@
dependencies {
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
api("androidx.activity:activity:1.2.0")
implementation(projectOrArtifact(":compose:runtime:runtime"))
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index fbcd800..2f632fb 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -43,12 +41,12 @@
implementation(project(":lifecycle:lifecycle-viewmodel-compose"))
implementation(project(":paging:paging-compose"))
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_REFLECT)
- implementation(ANDROIDX_TEST_RULES)
- implementation(ESPRESSO_CORE)
- implementation(JUNIT)
- implementation(TRUTH)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinReflect)
+ implementation(libs.testRules)
+ implementation(libs.espressoCore)
+ implementation(libs.junit)
+ implementation(libs.truth)
}
androidx {
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 0941a74..174200a 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -1,5 +1,3 @@
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("AndroidXComposePlugin")
@@ -20,7 +18,7 @@
dependencies {
kotlinPlugin(project(":compose:compiler:compiler"))
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":compose:material:material"))
implementation(project(":compose:runtime:runtime"))
diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle
index f400f4d..4269659 100644
--- a/compose/integration-tests/macrobenchmark/build.gradle
+++ b/compose/integration-tests/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")
@@ -36,11 +29,11 @@
androidTestImplementation(project(":benchmark:benchmark-junit4"))
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(ANDROIDX_TEST_UIAUTOMATOR)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testUiautomator)
}
// Define a task dependency so the app is installed before we run macro benchmarks.
diff --git a/compose/lint/common/build.gradle b/compose/lint/common/build.gradle
index c4a7ba1..b039cc5 100644
--- a/compose/lint/common/build.gradle
+++ b/compose/lint/common/build.gradle
@@ -16,28 +16,22 @@
import androidx.build.LibraryType
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
}
dependencies {
- if (rootProject.hasProperty("android.injected.invoked.from.ide")) {
- compileOnly(LINT_API_LATEST)
- } else {
- compileOnly(LINT_API_MIN)
- }
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.androidLintMinApi)
+ compileOnly(libs.kotlinStdlib)
- api(KOTLIN_METADATA_JVM)
+ api(libs.kotlinMetadataJvm)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(LINT_CORE)
- testImplementation(LINT_TESTS)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.androidLint)
+ testImplementation(libs.androidLintTests)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
androidx {
diff --git a/compose/lint/internal-lint-checks/build.gradle b/compose/lint/internal-lint-checks/build.gradle
index 7580281..961e2ff 100644
--- a/compose/lint/internal-lint-checks/build.gradle
+++ b/compose/lint/internal-lint-checks/build.gradle
@@ -16,8 +16,6 @@
import androidx.build.LibraryType
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("kotlin")
@@ -25,16 +23,16 @@
}
dependencies {
- compileOnly(LINT_API_LATEST)
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.androidLintApi)
+ compileOnly(libs.kotlinStdlib)
api(project(":lint-checks"))
implementation(project(":compose:lint:common"))
- testImplementation(KOTLIN_STDLIB)
- testImplementation(LINT_CORE)
- testImplementation(LINT_TESTS)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.androidLint)
+ testImplementation(libs.androidLintTests)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
androidx {
diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle
index a338f96..3650967 100644
--- a/compose/test-utils/build.gradle
+++ b/compose/test-utils/build.gradle
@@ -14,12 +14,9 @@
* limitations under the License.
*/
-
import androidx.build.AndroidXComposePlugin
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -41,21 +38,21 @@
api(projectOrArtifact(":compose:ui:ui-test-junit4"))
api(project(":test-screenshot"))
- implementation(KOTLIN_STDLIB_COMMON)
+ implementation(libs.kotlinStdlibCommon)
implementation(projectOrArtifact(":compose:runtime:runtime"))
implementation(projectOrArtifact(":compose:ui:ui-unit"))
implementation(projectOrArtifact(":compose:ui:ui-graphics"))
implementation(projectOrArtifact(":activity:activity-compose"))
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
compileOnly(projectOrArtifact(":compose:ui:ui-android-stubs"))
- testImplementation(TRUTH)
+ testImplementation(libs.truth)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.truth)
androidTestImplementation(projectOrArtifact(":compose:material:material"))
}
}
@@ -69,7 +66,7 @@
*/
sourceSets {
commonMain.dependencies {
- implementation(KOTLIN_STDLIB_COMMON)
+ implementation(libs.kotlinStdlibCommon)
implementation(projectOrArtifact(":compose:runtime:runtime"))
implementation(projectOrArtifact(":compose:ui:ui-unit"))
implementation(projectOrArtifact(":compose:ui:ui-graphics"))
@@ -84,16 +81,16 @@
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
compileOnly(projectOrArtifact(":compose:ui:ui-android-stubs"))
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
}
test.dependencies {
- implementation(TRUTH)
+ implementation(libs.truth)
}
androidAndroidTest.dependencies {
- implementation(TRUTH)
+ implementation(libs.truth)
implementation(projectOrArtifact(":compose:material:material"))
}
}
