From 674644da90f62b43925a2bedbfcf90028d89da0d Mon Sep 17 00:00:00 2001 From: Nick Anthony Date: Tue, 27 Jul 2021 17:52:46 -0400 Subject: [PATCH] Update -compose integration libraries to depend on Compose 1.0.1 Compose 1.0.1 is compiled against Kotlin 1.5.21. This matches the version of Kotlin at HEAD in androidx-main so it is possible to pin the Compose and Runtime. Generated by running: ``` find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/projectOrArtifact(\":compose:compiler:compiler\")/\"androidx.compose.compiler:compiler:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/projectOrArtifact(\":compose:runtime:runtime\")/\"androidx.compose.runtime:runtime:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/projectOrArtifact(\":compose:runtime:runtime-saveable\")/\"androidx.compose.runtime:runtime-saveable:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/project(\":compose:compiler:compiler\")/\"androidx.compose.compiler:compiler:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/project(\":compose:runtime:runtime\")/\"androidx.compose.runtime:runtime:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/project(\":compose:runtime:runtime-saveable\")/\"androidx.compose.runtime:runtime-saveable:1.0.1\"/g" find . -name "build.gradle" | grep "\-compose" | grep -v "integration-tests" | xargs sed -i "s/1.0.0-rc02\"/1.0.1\"/g" ``` Test: gw compileReleaseKotlin Test: gw bOS Change-Id: Ia63ca09c216634a73a70cb87386e8cbbafd898c4 --- activity/activity-compose/build.gradle | 8 ++++---- activity/activity-compose/samples/build.gradle | 6 +++--- hilt/hilt-navigation-compose/build.gradle | 6 +++--- hilt/hilt-navigation-compose/samples/build.gradle | 2 +- lifecycle/lifecycle-viewmodel-compose/build.gradle | 6 +++--- .../lifecycle-viewmodel-compose/samples/build.gradle | 2 +- navigation/navigation-compose/build.gradle | 12 ++++++------ navigation/navigation-compose/samples/build.gradle | 6 +++--- paging/paging-compose/build.gradle | 4 ++-- paging/paging-compose/samples/build.gradle | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle index c9c5b9ec21cae..5bd8c978bd811 100644 --- a/activity/activity-compose/build.gradle +++ b/activity/activity-compose/build.gradle @@ -26,13 +26,13 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) - api(projectOrArtifact(":compose:runtime:runtime")) - api(projectOrArtifact(":compose:runtime:runtime-saveable")) + api("androidx.compose.runtime:runtime:1.0.1") + api("androidx.compose.runtime:runtime-saveable:1.0.1") api(projectOrArtifact(":activity:activity-ktx")) - api("androidx.compose.ui:ui:1.0.0-rc02") + api("androidx.compose.ui:ui:1.0.1") androidTestImplementation projectOrArtifact(":compose:ui:ui-test-junit4") androidTestImplementation projectOrArtifact(":compose:material:material") diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle index db3752a6f25a5..4a7171c33bf6f 100644 --- a/activity/activity-compose/samples/build.gradle +++ b/activity/activity-compose/samples/build.gradle @@ -25,14 +25,14 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) compileOnly projectOrArtifact(":annotation:annotation-sampled") - implementation "androidx.compose.foundation:foundation:1.0.0-rc02" + implementation "androidx.compose.foundation:foundation:1.0.1" implementation projectOrArtifact(":activity:activity-compose") implementation projectOrArtifact(":activity:activity-ktx") - implementation "androidx.compose.material:material:1.0.0-rc02" + implementation "androidx.compose.material:material:1.0.1" } androidx { diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle index 1989f53323e93..078d9916cf0bd 100644 --- a/hilt/hilt-navigation-compose/build.gradle +++ b/hilt/hilt-navigation-compose/build.gradle @@ -35,12 +35,12 @@ android { } dependencies { - kotlinPlugin(project(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) api("androidx.hilt:hilt-navigation:1.0.0") - api(project(":compose:runtime:runtime")) - api("androidx.compose.ui:ui:1.0.0-rc02") + api("androidx.compose.runtime:runtime:1.0.1") + api("androidx.compose.ui:ui:1.0.1") api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07") api(projectOrArtifact(":navigation:navigation-compose")) diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle index 3c00b2cdc64b8..8eec1e38aa79d 100644 --- a/hilt/hilt-navigation-compose/samples/build.gradle +++ b/hilt/hilt-navigation-compose/samples/build.gradle @@ -27,7 +27,7 @@ plugins { } dependencies { - kotlinPlugin(project(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) compileOnly(projectOrArtifact(":annotation:annotation-sampled")) diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle index 6bf586b15bbdf..5346124427c64 100644 --- a/lifecycle/lifecycle-viewmodel-compose/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle @@ -27,11 +27,11 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0" - api(projectOrArtifact(":compose:runtime:runtime")) - api "androidx.compose.ui:ui:1.0.0-rc02" + api("androidx.compose.runtime:runtime:1.0.1") + api "androidx.compose.ui:ui:1.0.1" implementation(libs.kotlinStdlib) diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle index f4fcc199da47c..70c9431e66c8b 100644 --- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle @@ -26,7 +26,7 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) implementation projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose") } diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 564c1764b41d5..6448a7ed20f5b 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -26,15 +26,15 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) - implementation("androidx.compose.foundation:foundation-layout:1.0.0-rc02") + implementation("androidx.compose.foundation:foundation-layout:1.0.1") api("androidx.activity:activity-compose:1.3.0-rc02") - api("androidx.compose.animation:animation:1.0.0-rc02") - api(projectOrArtifact(":compose:runtime:runtime")) - api(projectOrArtifact(":compose:runtime:runtime-saveable")) - api("androidx.compose.ui:ui:1.0.0-rc02") + api("androidx.compose.animation:animation:1.0.1") + api("androidx.compose.runtime:runtime:1.0.1") + api("androidx.compose.runtime:runtime-saveable:1.0.1") + api("androidx.compose.ui:ui:1.0.1") api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07") api(projectOrArtifact(":navigation:navigation-runtime-ktx")) diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle index 192e0199d3ce1..088d4049d2265 100644 --- a/navigation/navigation-compose/samples/build.gradle +++ b/navigation/navigation-compose/samples/build.gradle @@ -25,13 +25,13 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) compileOnly(projectOrArtifact(":annotation:annotation-sampled")) - implementation("androidx.compose.foundation:foundation:1.0.0-rc02") + implementation("androidx.compose.foundation:foundation:1.0.1") implementation(projectOrArtifact(":navigation:navigation-compose")) - implementation("androidx.compose.material:material:1.0.0-rc02") + implementation("androidx.compose.material:material:1.0.1") } androidx { diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle index f6892b8949c0b..de8ffd0925112 100644 --- a/paging/paging-compose/build.gradle +++ b/paging/paging-compose/build.gradle @@ -28,10 +28,10 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) - api(projectOrArtifact(":compose:foundation:foundation")) + api("androidx.compose.foundation:foundation:1.0.1") api("androidx.paging:paging-common:3.0.0") androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4")) diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle index 8bd229e9732e0..5b7a3c13911f7 100644 --- a/paging/paging-compose/samples/build.gradle +++ b/paging/paging-compose/samples/build.gradle @@ -26,12 +26,12 @@ plugins { } dependencies { - kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) + kotlinPlugin("androidx.compose.compiler:compiler:1.0.1") implementation(libs.kotlinStdlib) compileOnly(projectOrArtifact(":annotation:annotation-sampled")) - implementation("androidx.compose.foundation:foundation:1.0.0-rc02") - implementation("androidx.compose.material:material:1.0.0-rc02") + implementation("androidx.compose.foundation:foundation:1.0.1") + implementation("androidx.compose.material:material:1.0.1") implementation(projectOrArtifact(":paging:paging-compose")) }