Skip to content

Commit 8324723

Browse files
Chris Baneschrisbanes
Chris Banes
authored and
chrisbanes
committedMar 24, 2021
Update to Compose 1.0.0-beta03
...and associated libraries releases. Change-Id: I5829f3fb5d33a74026733ff67ce565abc081aa65
·
v1.0.0-beta03
1 parent 11d010a commit 8324723

File tree

14 files changed

+33
-94
lines changed

14 files changed

+33
-94
lines changed
 

‎Crane/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ subprojects {
5757
}
5858
}
5959

60-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
61-
configurations.configureEach {
62-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
63-
if (details.requested.group == 'androidx.lifecycle'
64-
&& details.requested.version == '2.3.1') {
65-
details.useVersion('2.4.0-SNAPSHOT')
66-
}
67-
}
68-
}
69-
7060
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7161
kotlinOptions {
7262
// Treat all Kotlin warnings as errors

‎Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object Libs {
3030
}
3131

3232
object Accompanist {
33-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
33+
private const val version = "0.7.0"
3434
const val coil = "com.google.accompanist:accompanist-coil:$version"
3535
}
3636

@@ -49,14 +49,14 @@ object Libs {
4949

5050
object AndroidX {
5151
object Activity {
52-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
52+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
5353
}
5454

5555
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
5656

5757
object Compose {
58-
const val snapshot = "7217131"
59-
private const val version = "1.0.0-SNAPSHOT"
58+
const val snapshot = ""
59+
private const val version = "1.0.0-beta03"
6060

6161
const val runtime = "androidx.compose.runtime:runtime:$version"
6262
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -70,7 +70,7 @@ object Libs {
7070

7171
object Lifecycle {
7272
private const val version = "2.3.0"
73-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
73+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
7474
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
7575
}
7676

‎JetNews/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
buildscript {
1818
ext.kotlin_version = '1.4.31'
19-
ext.compose_version = '1.0.0-SNAPSHOT'
19+
ext.compose_version = '1.0.0-beta03'
2020
ext.coroutines_version = '1.4.2'
2121

2222
repositories {
@@ -38,7 +38,6 @@ subprojects {
3838
repositories {
3939
google()
4040
jcenter()
41-
maven { url "https://androidx.dev/snapshots/builds/7217131/artifacts/repository/" }
4241
}
4342

4443
apply plugin: 'com.diffplug.spotless'

‎Jetcaster/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ subprojects {
5858
}
5959
}
6060

61-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
62-
configurations.configureEach {
63-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
64-
if (details.requested.group == 'androidx.lifecycle'
65-
&& details.requested.version == '2.3.1') {
66-
details.useVersion('2.4.0-SNAPSHOT')
67-
}
68-
}
69-
}
70-
7161
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7262
kotlinOptions {
7363
// Treat all Kotlin warnings as errors

‎Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object Libs {
2727
const val material = "com.google.android.material:material:1.1.0"
2828

2929
object Accompanist {
30-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
30+
private const val version = "0.7.0"
3131
const val coil = "com.google.accompanist:accompanist-coil:$version"
3232
const val insets = "com.google.accompanist:accompanist-insets:$version"
3333
const val pager = "com.google.accompanist:accompanist-pager:$version"
@@ -65,16 +65,16 @@ object Libs {
6565
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
6666

6767
object Activity {
68-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
68+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
6969
}
7070

7171
object Constraint {
7272
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha03"
7373
}
7474

7575
object Compose {
76-
private const val snapshot = "7217131"
77-
private const val version = "1.0.0-SNAPSHOT"
76+
private const val snapshot = ""
77+
private const val version = "1.0.0-beta03"
7878

7979
@get:JvmStatic
8080
val snapshotUrl: String
@@ -93,7 +93,7 @@ object Libs {
9393

9494
object Lifecycle {
9595
private const val version = "2.3.0-beta01"
96-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
96+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
9797
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
9898
}
9999

‎Jetchat/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ subprojects {
5858
}
5959
}
6060

61-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
62-
configurations.configureEach {
63-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
64-
if (details.requested.group == 'androidx.lifecycle'
65-
&& details.requested.version == '2.3.1') {
66-
details.useVersion('2.4.0-SNAPSHOT')
67-
}
68-
}
69-
}
70-
7161
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7262
kotlinOptions {
7363
// Treat all Kotlin warnings as errors

‎Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object Libs {
4343
}
4444

4545
object Accompanist {
46-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
46+
private const val version = "0.7.0"
4747
const val insets = "com.google.accompanist:accompanist-insets:$version"
4848
}
4949

@@ -52,12 +52,12 @@ object Libs {
5252
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
5353

5454
object Activity {
55-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
55+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
5656
}
5757

5858
object Compose {
59-
const val snapshot = "7217131"
60-
const val version = "1.0.0-SNAPSHOT"
59+
const val snapshot = ""
60+
const val version = "1.0.0-beta03"
6161

6262
const val foundation = "androidx.compose.foundation:foundation:$version"
6363
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -96,7 +96,7 @@ object Libs {
9696
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
9797
const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
9898
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
99-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
99+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
100100
}
101101
}
102102
}

‎Jetsnack/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@ subprojects {
4444
}
4545
}
4646

47-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
48-
configurations.configureEach {
49-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
50-
if (details.requested.group == 'androidx.lifecycle'
51-
&& details.requested.version == '2.3.1') {
52-
details.useVersion('2.4.0-SNAPSHOT')
53-
}
54-
}
55-
}
56-
5747
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
5848
kotlinOptions {
5949
jvmTarget = '1.8'

‎Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object Libs {
2424
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha10"
2525

2626
object Accompanist {
27-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
27+
private const val version = "0.7.0"
2828
const val coil = "com.google.accompanist:accompanist-coil:$version"
2929
const val insets = "com.google.accompanist:accompanist-insets:$version"
3030
}
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
4848

4949
object Compose {
50-
const val snapshot = "7217131"
51-
const val version = "1.0.0-SNAPSHOT"
50+
const val snapshot = ""
51+
const val version = "1.0.0-beta03"
5252

5353
const val foundation = "androidx.compose.foundation:foundation:${version}"
5454
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
@@ -62,12 +62,12 @@ object Libs {
6262
}
6363

6464
object Activity {
65-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
65+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
6666
}
6767

6868
object Lifecycle {
6969
const val viewModelCompose =
70-
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
70+
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
7171
}
7272

7373
object ConstraintLayout {

‎Jetsurvey/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,6 @@ subprojects {
5656
}
5757
}
5858

59-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
60-
configurations.configureEach {
61-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
62-
if (details.requested.group == 'androidx.lifecycle'
63-
&& details.requested.version == '2.3.1') {
64-
details.useVersion('2.4.0-SNAPSHOT')
65-
}
66-
}
67-
}
68-
6959
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7060
kotlinOptions {
7161
// Treat all Kotlin warnings as errors

‎Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ object Libs {
2929
const val material = "com.google.android.material:material:1.1.0"
3030

3131
object Accompanist {
32-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
32+
private const val version = "0.7.0"
3333
const val coil = "com.google.accompanist:accompanist-coil:$version"
3434
}
3535

@@ -53,17 +53,17 @@ object Libs {
5353

5454
object Lifecycle {
5555
private const val version = "2.3.0-beta01"
56-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
56+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
5757
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
5858
}
5959

6060
object Activity {
61-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
61+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
6262
}
6363

6464
object Compose {
65-
const val snapshot = "7217131"
66-
const val version = "1.0.0-SNAPSHOT"
65+
const val snapshot = ""
66+
const val version = "1.0.0-beta03"
6767

6868
@get:JvmStatic
6969
val snapshotUrl: String

‎Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object Libs {
2424
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha10"
2525

2626
object Accompanist {
27-
private const val version = "0.6.3.compose-7217131-SNAPSHOT"
27+
private const val version = "0.7.0"
2828
const val coil = "com.google.accompanist:accompanist-coil:$version"
2929
const val insets = "com.google.accompanist:accompanist-insets:$version"
3030
}
@@ -53,8 +53,8 @@ object Libs {
5353
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha08"
5454

5555
object Compose {
56-
const val snapshot = "7217131"
57-
const val version = "1.0.0-SNAPSHOT"
56+
const val snapshot = ""
57+
const val version = "1.0.0-beta03"
5858

5959
const val animation = "androidx.compose.animation:animation:$version"
6060
const val foundation = "androidx.compose.foundation:foundation:$version"
@@ -69,7 +69,7 @@ object Libs {
6969
}
7070

7171
object Activity {
72-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
72+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
7373
}
7474

7575
object ConstraintLayout {

‎Rally/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ subprojects {
5858
}
5959
}
6060

61-
// FIXME: Only needed for Compose 1.0.0-beta03 snapshots
62-
configurations.configureEach {
63-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
64-
if (details.requested.group == 'androidx.lifecycle'
65-
&& details.requested.version == '2.3.1') {
66-
details.useVersion('2.4.0-SNAPSHOT')
67-
}
68-
}
69-
}
70-
7161
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
7262
kotlinOptions {
7363
// Treat all Kotlin warnings as errors

‎Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ object Libs {
4545
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
4646

4747
object Activity {
48-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
48+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha05"
4949
}
5050

5151
object Compose {
52-
const val snapshot = "7217131"
53-
const val version = "1.0.0-SNAPSHOT"
52+
const val snapshot = ""
53+
const val version = "1.0.0-beta03"
5454

5555
const val core = "androidx.compose.ui:ui:$version"
5656
const val foundation = "androidx.compose.foundation:foundation:$version"

0 commit comments

Comments
 (0)