Skip to content

Commit 651b6dd

Browse files
yrezguiyrezgui
authored
Merge pull request #435 from android/dev_beta02
[All] Update to beta02
2 parents 92f2f16 + 59e6fe6 commit 651b6dd

20 files changed

Lines changed: 153 additions & 131 deletions

File tree

‎Crane/app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ dependencies {
110110

111111
implementation Libs.Accompanist.coil
112112
implementation Libs.AndroidX.Activity.activityCompose
113+
implementation Libs.AndroidX.appcompat
113114
implementation Libs.AndroidX.Compose.runtime
114115
implementation Libs.AndroidX.Compose.runtimeLivedata
115116
implementation Libs.AndroidX.Compose.foundation

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import androidx.compose.ui.test.performClick
2323
import dagger.hilt.android.testing.HiltAndroidRule
2424
import dagger.hilt.android.testing.HiltAndroidTest
2525
import org.junit.Before
26-
import org.junit.Ignore
2726
import org.junit.Rule
2827
import org.junit.Test
2928

@@ -43,7 +42,6 @@ class HomeTest {
4342
}
4443
}
4544

46-
@Ignore("Swipeable bug makes the app crash: https://issuetracker.google.com/180488877")
4745
@Test
4846
fun home_navigatesToAllScreens() {
4947
composeTestRule.onNodeWithText("Explore Flights by Destination").assertIsDisplayed()

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

Lines changed: 8 additions & 6 deletions
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-alpha08"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
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.6.0"
33+
private const val version = "0.6.2"
3434
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3535
}
3636

3737
object Kotlin {
38-
private const val version = "1.4.30"
38+
private const val version = "1.4.31"
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,12 +49,14 @@ object Libs {
4949

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

55+
const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
56+
5557
object Compose {
5658
const val snapshot = ""
57-
private const val version = "1.0.0-beta01"
59+
private const val version = "1.0.0-beta02"
5860

5961
const val runtime = "androidx.compose.runtime:runtime:$version"
6062
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -68,7 +70,7 @@ object Libs {
6870

6971
object Lifecycle {
7072
private const val version = "2.3.0"
71-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
73+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
7274
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
7375
}
7476

‎JetNews/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ dependencies {
9191
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
9292

9393
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
94-
implementation 'androidx.activity:activity-ktx:1.2.0'
95-
implementation 'androidx.core:core-ktx:1.5.0-beta01'
96-
implementation "androidx.activity:activity-compose:1.3.0-alpha03"
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"
9797

9898
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
9999
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
100-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
100+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
101101

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

‎JetNews/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.4.30'
19-
ext.compose_version = '1.0.0-beta01'
18+
ext.kotlin_version = '1.4.31'
19+
ext.compose_version = '1.0.0-beta02'
2020
ext.coroutines_version = '1.4.2'
2121

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

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

‎Jetcaster/build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ subprojects {
4242
// Jetpack Compose SNAPSHOTs
4343
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
4444
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
45-
maven { url "http://androidx.dev/storage/repository/androidx/constraintlayout" }
4645
}
47-
48-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
4946
}
5047

5148
apply plugin: 'com.diffplug.spotless'

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ object Versions {
2121
}
2222

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

2727
const val material = "com.google.android.material:material:1.1.0"
2828

2929
object Accompanist {
30-
private const val version = "0.6.0"
30+
private const val version = "0.6.2"
3131
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3232
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
3333
}
3434

3535
object Kotlin {
36-
private const val version = "1.4.30"
36+
private const val version = "1.4.31"
3737
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3838
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3939
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -61,10 +61,10 @@ object Libs {
6161
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
6262
const val palette = "androidx.palette:palette:1.0.0"
6363

64-
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
64+
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
6565

6666
object Activity {
67-
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
67+
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
6868
}
6969

7070
object Constraint {
@@ -73,7 +73,7 @@ object Libs {
7373

7474
object Compose {
7575
private const val snapshot = ""
76-
private const val version = "1.0.0-beta01"
76+
private const val version = "1.0.0-beta02"
7777

7878
@get:JvmStatic
7979
val snapshotUrl: String
@@ -92,7 +92,7 @@ object Libs {
9292

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

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.compose.ui.test.performGesture
3131
import androidx.compose.ui.test.swipe
3232
import com.example.compose.jetchat.conversation.ConversationContent
3333
import com.example.compose.jetchat.conversation.ConversationTestTag
34+
import com.example.compose.jetchat.conversation.ConversationUiState
3435
import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
3536
import com.example.compose.jetchat.data.exampleUiState
3637
import com.example.compose.jetchat.theme.JetchatTheme
@@ -65,7 +66,7 @@ class ConversationTest {
6566
) {
6667
JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
6768
ConversationContent(
68-
uiState = exampleUiState,
69+
uiState = conversationTestUiState,
6970
navigateToProfile = { },
7071
onNavIconPressed = { }
7172
)
@@ -163,3 +164,12 @@ class ConversationTest {
163164
)
164165
.performClick()
165166
}
167+
168+
/**
169+
* Make the list of messages longer so the test makes sense on tablets.
170+
*/
171+
private val conversationTestUiState = ConversationUiState(
172+
initialMessages = (exampleUiState.messages.plus(exampleUiState.messages)),
173+
channelName = "#composers",
174+
channelMembers = 42
175+
)

0 commit comments

Comments
 (0)