Skip to content

Commit 674644d

Browse files
NickAnthonyNickAnthony
committed
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
1 parent 908fa60 commit 674644d

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎activity/activity-compose/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ plugins {
2626
}
2727

2828
dependencies {
29-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
29+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3030

3131
implementation(libs.kotlinStdlib)
32-
api(projectOrArtifact(":compose:runtime:runtime"))
33-
api(projectOrArtifact(":compose:runtime:runtime-saveable"))
32+
api("androidx.compose.runtime:runtime:1.0.1")
33+
api("androidx.compose.runtime:runtime-saveable:1.0.1")
3434
api(projectOrArtifact(":activity:activity-ktx"))
35-
api("androidx.compose.ui:ui:1.0.0-rc02")
35+
api("androidx.compose.ui:ui:1.0.1")
3636

3737
androidTestImplementation projectOrArtifact(":compose:ui:ui-test-junit4")
3838
androidTestImplementation projectOrArtifact(":compose:material:material")

‎activity/activity-compose/samples/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ plugins {
2525
}
2626

2727
dependencies {
28-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
28+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
2929
implementation(libs.kotlinStdlib)
3030

3131
compileOnly projectOrArtifact(":annotation:annotation-sampled")
32-
implementation "androidx.compose.foundation:foundation:1.0.0-rc02"
32+
implementation "androidx.compose.foundation:foundation:1.0.1"
3333
implementation projectOrArtifact(":activity:activity-compose")
3434
implementation projectOrArtifact(":activity:activity-ktx")
35-
implementation "androidx.compose.material:material:1.0.0-rc02"
35+
implementation "androidx.compose.material:material:1.0.1"
3636
}
3737

3838
androidx {

‎hilt/hilt-navigation-compose/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ android {
3535
}
3636

3737
dependencies {
38-
kotlinPlugin(project(":compose:compiler:compiler"))
38+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3939

4040
implementation(libs.kotlinStdlib)
4141
api("androidx.hilt:hilt-navigation:1.0.0")
42-
api(project(":compose:runtime:runtime"))
43-
api("androidx.compose.ui:ui:1.0.0-rc02")
42+
api("androidx.compose.runtime:runtime:1.0.1")
43+
api("androidx.compose.ui:ui:1.0.1")
4444
api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
4545
api(projectOrArtifact(":navigation:navigation-compose"))
4646

‎hilt/hilt-navigation-compose/samples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins {
2727
}
2828

2929
dependencies {
30-
kotlinPlugin(project(":compose:compiler:compiler"))
30+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3131
implementation(libs.kotlinStdlib)
3232

3333
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))

‎lifecycle/lifecycle-viewmodel-compose/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ plugins {
2727
}
2828

2929
dependencies {
30-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
30+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3131

3232
api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0"
33-
api(projectOrArtifact(":compose:runtime:runtime"))
34-
api "androidx.compose.ui:ui:1.0.0-rc02"
33+
api("androidx.compose.runtime:runtime:1.0.1")
34+
api "androidx.compose.ui:ui:1.0.1"
3535

3636
implementation(libs.kotlinStdlib)
3737

‎lifecycle/lifecycle-viewmodel-compose/samples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ plugins {
2626
}
2727

2828
dependencies {
29-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
29+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3030
implementation(libs.kotlinStdlib)
3131
implementation projectOrArtifact(":lifecycle:lifecycle-viewmodel-compose")
3232
}

‎navigation/navigation-compose/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ plugins {
2626
}
2727

2828
dependencies {
29-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
29+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3030

3131
implementation(libs.kotlinStdlib)
32-
implementation("androidx.compose.foundation:foundation-layout:1.0.0-rc02")
32+
implementation("androidx.compose.foundation:foundation-layout:1.0.1")
3333
api("androidx.activity:activity-compose:1.3.0-rc02")
34-
api("androidx.compose.animation:animation:1.0.0-rc02")
35-
api(projectOrArtifact(":compose:runtime:runtime"))
36-
api(projectOrArtifact(":compose:runtime:runtime-saveable"))
37-
api("androidx.compose.ui:ui:1.0.0-rc02")
34+
api("androidx.compose.animation:animation:1.0.1")
35+
api("androidx.compose.runtime:runtime:1.0.1")
36+
api("androidx.compose.runtime:runtime-saveable:1.0.1")
37+
api("androidx.compose.ui:ui:1.0.1")
3838
api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
3939
api(projectOrArtifact(":navigation:navigation-runtime-ktx"))
4040

‎navigation/navigation-compose/samples/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ plugins {
2525
}
2626

2727
dependencies {
28-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
28+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
2929
implementation(libs.kotlinStdlib)
3030

3131
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
32-
implementation("androidx.compose.foundation:foundation:1.0.0-rc02")
32+
implementation("androidx.compose.foundation:foundation:1.0.1")
3333
implementation(projectOrArtifact(":navigation:navigation-compose"))
34-
implementation("androidx.compose.material:material:1.0.0-rc02")
34+
implementation("androidx.compose.material:material:1.0.1")
3535
}
3636

3737
androidx {

‎paging/paging-compose/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ plugins {
2828
}
2929

3030
dependencies {
31-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
31+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3232

3333
implementation(libs.kotlinStdlib)
34-
api(projectOrArtifact(":compose:foundation:foundation"))
34+
api("androidx.compose.foundation:foundation:1.0.1")
3535
api("androidx.paging:paging-common:3.0.0")
3636

3737
androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4"))

‎paging/paging-compose/samples/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ plugins {
2626
}
2727

2828
dependencies {
29-
kotlinPlugin(projectOrArtifact(":compose:compiler:compiler"))
29+
kotlinPlugin("androidx.compose.compiler:compiler:1.0.1")
3030
implementation(libs.kotlinStdlib)
3131

3232
compileOnly(projectOrArtifact(":annotation:annotation-sampled"))
33-
implementation("androidx.compose.foundation:foundation:1.0.0-rc02")
34-
implementation("androidx.compose.material:material:1.0.0-rc02")
33+
implementation("androidx.compose.foundation:foundation:1.0.1")
34+
implementation("androidx.compose.material:material:1.0.1")
3535
implementation(projectOrArtifact(":paging:paging-compose"))
3636
}
3737

0 commit comments

Comments
 (0)