Skip to content

Commit b8a6e72

Browse files
nickbutchernickbutcher
authoredApr 8, 2021
Merge pull request android#457 from android/dev_beta04
[All] Update to Compose 1.0.0-beta04
·
v1.0.0-beta04
2 parents f1777b2 + ccb098d commit b8a6e72

File tree

27 files changed

+119
-106
lines changed

27 files changed

+119
-106
lines changed
 

Diff for: ‎Crane/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ buildscript {
3131
}
3232

3333
plugins {
34-
id 'com.diffplug.spotless' version '5.10.0'
34+
id 'com.diffplug.spotless' version '5.11.1'
3535
}
3636

3737
subprojects {

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha11"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha14"
2525
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
2626

2727
object GoogleMaps {
@@ -30,12 +30,12 @@ object Libs {
3030
}
3131

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

3737
object Kotlin {
38-
private const val version = "1.4.31"
38+
private const val version = "1.4.32"
3939
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
4040
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4141
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -49,14 +49,14 @@ object Libs {
4949

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

55-
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
55+
const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
5656

5757
object Compose {
5858
const val snapshot = ""
59-
private const val version = "1.0.0-beta03"
59+
private const val version = "1.0.0-beta04"
6060

6161
const val runtime = "androidx.compose.runtime:runtime:$version"
6262
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -69,17 +69,17 @@ object Libs {
6969
}
7070

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

7777
object Test {
78-
private const val version = "1.2.0"
78+
private const val version = "1.3.0"
7979
const val runner = "androidx.test:runner:$version"
8080
const val rules = "androidx.test:rules:$version"
8181
object Ext {
82-
private const val version = "1.1.2-rc01"
82+
private const val version = "1.1.2"
8383
const val junit = "androidx.test.ext:junit-ktx:$version"
8484
}
8585
const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"

Diff for: ‎Crane/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎JetNews/app/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ dependencies {
9090
implementation "androidx.compose.ui:ui-tooling:$compose_version"
9191
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
9292

93-
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
94-
implementation 'androidx.activity:activity-ktx:1.2.1'
95-
implementation 'androidx.core:core-ktx:1.5.0-beta03'
96-
implementation "androidx.activity:activity-compose:1.3.0-alpha04"
93+
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
94+
implementation 'androidx.activity:activity-ktx:1.2.2'
95+
implementation 'androidx.core:core-ktx:1.6.0-alpha01'
96+
implementation "androidx.activity:activity-compose:1.3.0-alpha06"
9797

9898
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
99-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
100-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
99+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
100+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
101101

102102
androidTestImplementation 'androidx.test:rules:1.3.0'
103103
androidTestImplementation 'androidx.test:runner:1.3.0'

Diff for: ‎JetNews/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.4.31'
19-
ext.compose_version = '1.0.0-beta03'
18+
ext.kotlin_version = '1.4.32'
19+
ext.compose_version = '1.0.0-beta04'
2020
ext.coroutines_version = '1.4.2'
2121

2222
repositories {
@@ -25,13 +25,13 @@ buildscript {
2525
}
2626

2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:7.0.0-alpha11'
28+
classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
2929
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3030
}
3131
}
3232

3333
plugins {
34-
id 'com.diffplug.spotless' version '5.10.0'
34+
id 'com.diffplug.spotless' version '5.11.1'
3535
}
3636

3737
subprojects {

Diff for: ‎JetNews/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎Jetcaster/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030
}
3131

3232
plugins {
33-
id 'com.diffplug.spotless' version '5.10.0'
33+
id 'com.diffplug.spotless' version '5.11.1'
3434
}
3535

3636
subprojects {

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha11"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha14"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

27-
const val material = "com.google.android.material:material:1.1.0"
27+
const val material = "com.google.android.material:material:1.3.0"
2828

2929
object Accompanist {
30-
private const val version = "0.7.0"
30+
private const val version = "0.7.1"
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"
3434
}
3535

3636
object Kotlin {
37-
private const val version = "1.4.31"
37+
private const val version = "1.4.32"
3838
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3939
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4040
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -48,7 +48,7 @@ object Libs {
4848
}
4949

5050
object OkHttp {
51-
private const val version = "4.9.0"
51+
private const val version = "4.9.1"
5252
const val okhttp = "com.squareup.okhttp3:okhttp:$version"
5353
const val logging = "com.squareup.okhttp3:logging-interceptor:$version"
5454
}
@@ -62,19 +62,19 @@ object Libs {
6262
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
6363
const val palette = "androidx.palette:palette:1.0.0"
6464

65-
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
65+
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"
6666

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

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

7575
object Compose {
7676
private const val snapshot = ""
77-
private const val version = "1.0.0-beta03"
77+
private const val version = "1.0.0-beta04"
7878

7979
@get:JvmStatic
8080
val snapshotUrl: String
@@ -92,26 +92,26 @@ object Libs {
9292
}
9393

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

100100
object Test {
101-
private const val version = "1.2.0"
101+
private const val version = "1.3.0"
102102
const val core = "androidx.test:core:$version"
103103
const val rules = "androidx.test:rules:$version"
104104

105105
object Ext {
106-
private const val version = "1.1.2-rc01"
106+
private const val version = "1.1.2"
107107
const val junit = "androidx.test.ext:junit-ktx:$version"
108108
}
109109

110110
const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"
111111
}
112112

113113
object Room {
114-
private const val version = "2.2.5"
114+
private const val version = "2.2.6"
115115
const val runtime = "androidx.room:room-runtime:${version}"
116116
const val ktx = "androidx.room:room-ktx:${version}"
117117
const val compiler = "androidx.room:room-compiler:${version}"

Diff for: ‎Jetcaster/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ class ConversationTest {
116116
@Test
117117
fun jumpToBottom_snapsToBottomAfterUserInteracted() {
118118
// First swipe
119-
composeTestRule.onNodeWithTag(ConversationTestTag).performGesture {
119+
composeTestRule.onNodeWithTag(
120+
testTag = ConversationTestTag,
121+
useUnmergedTree = true // https://issuetracker.google.com/issues/184825850
122+
).performGesture {
120123
this.swipe(
121124
start = this.center,
122125
end = Offset(this.center.x, this.center.y + 500),
@@ -160,7 +163,8 @@ class ConversationTest {
160163
private fun openEmojiSelector() =
161164
composeTestRule
162165
.onNodeWithContentDescription(
163-
composeTestRule.activity.getString(R.string.emoji_selector_bt_desc)
166+
label = composeTestRule.activity.getString(R.string.emoji_selector_bt_desc),
167+
useUnmergedTree = true // https://issuetracker.google.com/issues/184825850
164168
)
165169
.performClick()
166170
}

Diff for: ‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ class UserInputTest {
154154

155155
private fun openEmojiSelector() =
156156
composeTestRule
157-
.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_bt_desc))
157+
.onNodeWithContentDescription(
158+
label = activity.getString(R.string.emoji_selector_bt_desc),
159+
useUnmergedTree = true // https://issuetracker.google.com/issues/184825850
160+
)
158161
.performClick()
159162

160163
private fun assertEmojiSelectorIsDisplayed() =

Diff for: ‎Jetchat/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232
}
3333

3434
plugins {
35-
id 'com.diffplug.spotless' version '5.10.0'
35+
id 'com.diffplug.spotless' version '5.11.1'
3636
}
3737

3838
subprojects {

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha11"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha14"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
2828

29-
const val material = "com.google.android.material:material:1.1.0"
29+
const val material = "com.google.android.material:material:1.3.0"
3030

3131
object Kotlin {
32-
private const val version = "1.4.31"
32+
private const val version = "1.4.32"
3333
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3434
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3535
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -43,21 +43,21 @@ object Libs {
4343
}
4444

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

5050
object AndroidX {
51-
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
52-
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
51+
const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
52+
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"
5353

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

5858
object Compose {
5959
const val snapshot = ""
60-
const val version = "1.0.0-beta03"
60+
const val version = "1.0.0-beta04"
6161

6262
const val foundation = "androidx.compose.foundation:foundation:$version"
6363
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -73,7 +73,7 @@ object Libs {
7373
}
7474

7575
object Navigation {
76-
private const val version = "2.3.3"
76+
private const val version = "2.3.4"
7777
const val fragment = "androidx.navigation:navigation-fragment-ktx:$version"
7878
const val uiKtx = "androidx.navigation:navigation-ui-ktx:$version"
7979
}
@@ -92,11 +92,11 @@ object Libs {
9292
}
9393

9494
object Lifecycle {
95-
private const val version = "2.3.0"
95+
private const val version = "2.3.1"
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-alpha03"
99+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
100100
}
101101
}
102102
}

Diff for: ‎Jetchat/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎Jetsnack/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
}
3030

3131
plugins {
32-
id 'com.diffplug.spotless' version '5.10.0'
32+
id 'com.diffplug.spotless' version '5.11.1'
3333
}
3434

3535
subprojects {

0 commit comments

Comments
 (0)
Please sign in to comment.