Skip to content

[All] Update to beta02 #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 55 commits into from
Mar 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f5286ea
[Jetchat] ConversationTest: Makes list of messages longer so it makes…
JoseAlcerreca Feb 26, 2021
85c5c58
[Jetchat] Migrates to LazyColumn. Fixes #371
JoseAlcerreca Feb 26, 2021
f6a03bb
Use derivedStateOf for JumpToBottom button
JoseAlcerreca Mar 1, 2021
8acfa41
Indentation nits
JoseAlcerreca Mar 1, 2021
33a772b
Remember to remember the *StateOfs
JoseAlcerreca Mar 1, 2021
7d3089e
Simplifies expression
JoseAlcerreca Mar 1, 2021
195c1d8
Merge pull request #413 from JoseAlcerreca/jetchat_beta02
JoseAlcerreca Mar 1, 2021
094d11a
Update to AndroidX Core 1.5.0-beta02
chrisbanes Mar 2, 2021
201993a
Fix LazyColumn usage
chrisbanes Mar 2, 2021
194568e
Merge pull request #418 from android/cb/jc-updates
chrisbanes Mar 2, 2021
4af53a9
[Jetcaster] Update to beta02 snapshot
yrezgui Mar 9, 2021
a61fedb
Update Compose snapshot
yrezgui Mar 9, 2021
7809ea5
Clean unused code
yrezgui Mar 9, 2021
7c70040
[Jetnews] Update to 7184376 snapshot
yrezgui Mar 10, 2021
7eb9567
[Rally] updates to 7184376
JoseAlcerreca Mar 10, 2021
6ca6126
[Crane] Update to SNAPSHOT 7184376 (#427)
manuelvicnt Mar 10, 2021
1893594
[Jetchat] updates to 7184376
JoseAlcerreca Mar 10, 2021
ae95583
[Jetnews] Update to 7184376 snapshot
yrezgui Mar 10, 2021
243abbb
Merge branch 'jetnews-beta02' of github.com:yrezgui/compose-samples i…
yrezgui Mar 10, 2021
961f2d7
[Jetsurvey] Update to 7184376 snapshot
yrezgui Mar 10, 2021
1a2c644
[Jetsnack] Update to 7184376 snapshot
yrezgui Mar 10, 2021
d9dff9a
[Owl] Update to Compose beta02
yrezgui Mar 10, 2021
f17cc28
Merge branch 'dev_beta02' into rally_beta02
yrezgui Mar 10, 2021
e43349a
Merge pull request #428 from JoseAlcerreca/rally_beta02
yrezgui Mar 10, 2021
dfa55bc
Merge branch 'dev_beta02' into jetchat_beta02_2
yrezgui Mar 10, 2021
efc24b0
Merge branch 'dev_beta02' into jetcaster-beta02
yrezgui Mar 10, 2021
2d8e79a
Merge branch 'dev_beta02' into jetsnack-beta02
yrezgui Mar 10, 2021
025de9a
Merge branch 'dev_beta02' into owl-beta02
yrezgui Mar 10, 2021
01dce66
Merge branch 'dev_beta02' into jetnews-beta02
yrezgui Mar 10, 2021
2fdcd8c
Merge branch 'dev_beta02' into jetsurvey-beta02
yrezgui Mar 10, 2021
e16c26a
Merge pull request #425 from yrezgui/jetcaster-beta02
yrezgui Mar 10, 2021
8363975
Merge branch 'dev_beta02' into jetchat_beta02_2
yrezgui Mar 10, 2021
caed338
Merge pull request #429 from JoseAlcerreca/jetchat_beta02_2
yrezgui Mar 10, 2021
5c31c9c
Merge branch 'dev_beta02' into jetsurvey-beta02
yrezgui Mar 10, 2021
07bccc0
Merge branch 'dev_beta02' into jetnews-beta02
yrezgui Mar 10, 2021
5c79d16
Merge pull request #431 from yrezgui/jetsurvey-beta02
yrezgui Mar 11, 2021
d615d7e
Merge branch 'dev_beta02' into jetnews-beta02
JolandaVerhoef Mar 11, 2021
a69cdc3
Merge branch 'dev_beta02' into jetsnack-beta02
yrezgui Mar 11, 2021
d48d0ed
Merge pull request #432 from yrezgui/jetsnack-beta02
yrezgui Mar 11, 2021
199da4b
Merge branch 'dev_beta02' into owl-beta02
yrezgui Mar 11, 2021
df95fd8
Merge branch 'dev_beta02' into jetnews-beta02
yrezgui Mar 11, 2021
aedd0a9
Merge pull request #426 from yrezgui/jetnews-beta02
yrezgui Mar 11, 2021
633021f
Merge branch 'dev_beta02' into owl-beta02
yrezgui Mar 11, 2021
87916da
Merge pull request #434 from yrezgui/owl-beta02
yrezgui Mar 11, 2021
202d5bd
[Jetnews] Update to beta02
yrezgui Mar 11, 2021
e4018e7
[Crane] Update Crane to beta02
yrezgui Mar 11, 2021
74fc606
[Jetchat] Update to beta02
yrezgui Mar 11, 2021
e3d29a8
[Owl] Update to beta02
yrezgui Mar 11, 2021
2b5b74b
[Jetsnack] Update to beta02
yrezgui Mar 11, 2021
a367b9c
[Jetcaster] Update to beta02
yrezgui Mar 11, 2021
6b93e1b
[Jetsurvey] Update to beta02
yrezgui Mar 11, 2021
7cf559a
[Jetsurvey] Update to beta02
yrezgui Mar 11, 2021
7fb687d
[Rally] Update to beta02
yrezgui Mar 11, 2021
549d130
[All] Remove unused repositories URLs
yrezgui Mar 11, 2021
59e6fe6
Merge pull request #436 from yrezgui/dev_beta02
yrezgui Mar 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Crane/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ dependencies {

implementation Libs.Accompanist.coil
implementation Libs.AndroidX.Activity.activityCompose
implementation Libs.AndroidX.appcompat
implementation Libs.AndroidX.Compose.runtime
implementation Libs.AndroidX.Compose.runtimeLivedata
implementation Libs.AndroidX.Compose.foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import androidx.compose.ui.test.performClick
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

Expand All @@ -43,7 +42,6 @@ class HomeTest {
}
}

@Ignore("Swipeable bug makes the app crash: https://issuetracker.google.com/180488877")
@Test
fun home_navigatesToAllScreens() {
composeTestRule.onNodeWithText("Explore Flights by Destination").assertIsDisplayed()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"

object GoogleMaps {
Expand All @@ -30,12 +30,12 @@ object Libs {
}

object Accompanist {
private const val version = "0.6.0"
private const val version = "0.6.2"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
}

object Kotlin {
private const val version = "1.4.30"
private const val version = "1.4.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand All @@ -49,12 +49,14 @@ object Libs {

object AndroidX {
object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
}

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

object Compose {
const val snapshot = ""
private const val version = "1.0.0-beta01"
private const val version = "1.0.0-beta02"

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

object Lifecycle {
private const val version = "2.3.0"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
}

Expand Down
8 changes: 4 additions & 4 deletions JetNews/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ dependencies {
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"

implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
implementation 'androidx.activity:activity-ktx:1.2.0'
implementation 'androidx.core:core-ktx:1.5.0-beta01'
implementation "androidx.activity:activity-compose:1.3.0-alpha03"
implementation 'androidx.activity:activity-ktx:1.2.1'
implementation 'androidx.core:core-ktx:1.5.0-beta03'
implementation "androidx.activity:activity-compose:1.3.0-alpha04"

implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"

androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
Expand Down
6 changes: 3 additions & 3 deletions JetNews/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

buildscript {
ext.kotlin_version = '1.4.30'
ext.compose_version = '1.0.0-beta01'
ext.kotlin_version = '1.4.31'
ext.compose_version = '1.0.0-beta02'
ext.coroutines_version = '1.4.2'

repositories {
Expand All @@ -25,7 +25,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
classpath 'com.android.tools.build:gradle:7.0.0-alpha09'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
3 changes: 0 additions & 3 deletions Jetcaster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ subprojects {
// Jetpack Compose SNAPSHOTs
if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
maven { url "http://androidx.dev/storage/repository/androidx/constraintlayout" }
}

maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

apply plugin: 'com.diffplug.spotless'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ object Versions {
}

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

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

object Accompanist {
private const val version = "0.6.0"
private const val version = "0.6.2"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}

object Kotlin {
private const val version = "1.4.30"
private const val version = "1.4.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand Down Expand Up @@ -61,10 +61,10 @@ object Libs {
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
const val palette = "androidx.palette:palette:1.0.0"

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

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
}

object Constraint {
Expand All @@ -73,7 +73,7 @@ object Libs {

object Compose {
private const val snapshot = ""
private const val version = "1.0.0-beta01"
private const val version = "1.0.0-beta02"

@get:JvmStatic
val snapshotUrl: String
Expand All @@ -92,7 +92,7 @@ object Libs {

object Lifecycle {
private const val version = "2.3.0-beta01"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.compose.ui.test.performGesture
import androidx.compose.ui.test.swipe
import com.example.compose.jetchat.conversation.ConversationContent
import com.example.compose.jetchat.conversation.ConversationTestTag
import com.example.compose.jetchat.conversation.ConversationUiState
import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
import com.example.compose.jetchat.data.exampleUiState
import com.example.compose.jetchat.theme.JetchatTheme
Expand Down Expand Up @@ -65,7 +66,7 @@ class ConversationTest {
) {
JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
ConversationContent(
uiState = exampleUiState,
uiState = conversationTestUiState,
navigateToProfile = { },
onNavIconPressed = { }
)
Expand Down Expand Up @@ -163,3 +164,12 @@ class ConversationTest {
)
.performClick()
}

/**
* Make the list of messages longer so the test makes sense on tablets.
*/
private val conversationTestUiState = ConversationUiState(
initialMessages = (exampleUiState.messages.plus(exampleUiState.messages)),
channelName = "#composers",
channelMembers = 42
)
Loading