Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Compose 1.2.0-beta03 #1186

Merged
merged 3 commits into from Jun 3, 2022
Merged

Compose 1.2.0-beta03 #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3037cac
Prepare for next release
bentrengrove Jun 1, 2022
2613964
Fix navigation material dismiss issue
bentrengrove Jun 3, 2022
d43f81c
v0.24.10-beta
bentrengrove Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions appcompat-theme/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -103,6 +103,9 @@ dependencies {
androidTestImplementation libs.androidx.test.runner
testImplementation libs.androidx.test.runner

androidTestImplementation libs.androidx.test.espressoCore
testImplementation libs.androidx.test.espressoCore

testImplementation libs.robolectric
}

Expand Down
4 changes: 2 additions & 2 deletions drawablepainter/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions flowlayout/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000

GROUP=com.google.accompanist
# !! No longer need to update this manually when using a Compose SNAPSHOT
VERSION_NAME=0.24.10-SNAPSHOT
VERSION_NAME=0.24.10-beta

POM_DESCRIPTION=Utilities for Jetpack Compose

Expand Down
17 changes: 10 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
@@ -1,9 +1,9 @@
[versions]
compose = "1.2.0-beta02"
compose = "1.2.0-beta03"
composesnapshot = "-" # a single character = no snapshot

# gradlePlugin and lint need to be updated together
gradlePlugin = "7.1.3"
gradlePlugin = "7.3.0-beta01"
lintMinCompose = "30.0.0"

ktlint = "0.42.1"
Expand All @@ -13,7 +13,7 @@ okhttp = "3.12.13"
coil = "1.3.2"

androidxtest = "1.4.0"
androidxnavigation = "2.5.0-alpha04"
androidxnavigation = "2.5.0-rc01"

[libraries]
compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
Expand Down Expand Up @@ -55,7 +55,7 @@ coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }

androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"
androidx-core = "androidx.core:core-ktx:1.8.0-alpha06"
androidx-activity-compose = "androidx.activity:activity-compose:1.4.0"
androidx-activity-compose = "androidx.activity:activity-compose:1.5.0-rc01"
androidx-fragment = "androidx.fragment:fragment-ktx:1.4.0"
androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03"
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
Expand All @@ -71,11 +71,14 @@ androidx-test-runner = { module = "androidx.test:runner", version.ref = "android
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxtest" }
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxtest" }
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0"
androidx-test-espressoWeb = "androidx.test.espresso:espresso-web:3.4.0"

junit = "junit:junit:4.13"
# alpha for robolectric x compose fix
androidx-test-espressoCore = "androidx.test.espresso:espresso-core:3.5.0-alpha06"
androidx-test-espressoWeb = "androidx.test.espresso:espresso-web:3.5.0-alpha06"

junit = "junit:junit:4.13.2"
truth = "com.google.truth:truth:1.1.2"
robolectric = "org.robolectric:robolectric:4.5.1"
robolectric = "org.robolectric:robolectric:4.8"

affectedmoduledetector = "com.dropbox.affectedmoduledetector:affectedmoduledetector:0.1.2"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions insets-ui/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions insets/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
2 changes: 1 addition & 1 deletion internal-testutils/build.gradle
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ plugins {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
Expand Down
4 changes: 2 additions & 2 deletions navigation-animation/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
9 changes: 2 additions & 7 deletions navigation-material/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -75,11 +75,6 @@ dependencies {
implementation libs.compose.foundation.foundation
implementation libs.compose.material.material

// FIXME: Needed because navigation-compose 2.4.0-SNAPSHOT forces activity-compose 1.3.0-rc02,
// and our test dependencies depend on 1.3.0. We need to explicitly tell Gradle what version
// to use.
implementation libs.androidx.activity.compose

// ======================
// Test dependencies
// ======================
Expand Down
10 changes: 2 additions & 8 deletions ...ion-material/src/main/java/com/google/accompanist/navigation/material/SheetContentHost.kt
View file
Open in desktop
Expand Up @@ -41,8 +41,6 @@ import androidx.navigation.NavBackStackEntry
import androidx.navigation.compose.LocalOwnersProvider
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.flow.filter
Expand All @@ -64,7 +62,7 @@ import kotlinx.coroutines.withTimeout
* pop the back stack here.
*/
@ExperimentalMaterialNavigationApi
@OptIn(ExperimentalMaterialApi::class, ExperimentalCoroutinesApi::class)
@OptIn(ExperimentalMaterialApi::class)
@Composable
internal fun SheetContentHost(
columnHost: ColumnScope,
Expand Down Expand Up @@ -141,11 +139,7 @@ internal fun SheetContentHost(
onDispose {
scope.launch {
hideCalled = true
try {
sheetState.internalHide()
} finally {
hideCalled = false
}
sheetState.internalHide()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Certainly not the ideal solution but if it works I can come back to it next week :)

}
}
}
Expand Down
4 changes: 2 additions & 2 deletions pager-indicators/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions pager/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions permissions/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down
4 changes: 2 additions & 2 deletions placeholder-material/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions placeholder/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
View file
Open in desktop
Expand Up @@ -19,12 +19,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
applicationId "com.google.accompanist.sample"
minSdkVersion 21
targetSdkVersion 31
targetSdkVersion 32

versionCode 1
versionName "1.0"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/

plugins {
id 'com.gradle.enterprise' version '3.5'
id 'com.gradle.enterprise' version '3.10.1'
}

gradleEnterprise {
Expand Down
4 changes: 2 additions & 2 deletions swiperefresh/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions systemuicontroller/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
4 changes: 2 additions & 2 deletions web/build.gradle
View file
Open in desktop
Expand Up @@ -25,12 +25,12 @@ kotlin {
}

android {
compileSdkVersion 31
compileSdkVersion 32

defaultConfig {
minSdkVersion 21
// targetSdkVersion has no effect for libraries. This is only used for the test APK
targetSdkVersion 31
targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down