Skip to content

Commit

Permalink
Update -compose integration libraries to depend on Compose 1.0.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
NickAnthony committed Jul 27, 2021
1 parent 908fa60 commit 674644d
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
8 changes: 4 additions & 4 deletions activity/activity-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions activity/activity-compose/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions hilt/hilt-navigation-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
2 changes: 1 addition & 1 deletion hilt/hilt-navigation-compose/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
6 changes: 3 additions & 3 deletions lifecycle/lifecycle-viewmodel-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
12 changes: 6 additions & 6 deletions navigation/navigation-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
6 changes: 3 additions & 3 deletions navigation/navigation-compose/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions paging/paging-compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
6 changes: 3 additions & 3 deletions paging/paging-compose/samples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}

Expand Down

0 comments on commit 674644d

Please sign in to comment.