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.

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

Update to Compose 1.3.0-beta01 #1307

Merged
merged 6 commits into from Aug 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -76,7 +76,7 @@ jobs:
test:
runs-on: macos-latest
needs: build
timeout-minutes: 50
timeout-minutes: 70

strategy:
# Allow tests to continue on other devices if they fail on one device.
Expand All @@ -89,7 +89,7 @@ jobs:
TERM: dumb

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# Fetch expanded history, which is needed for affected module detection
fetch-depth: '500'
Expand All @@ -108,7 +108,7 @@ jobs:
- name: Generate cache key
run: ./checksum.sh checksum.txt

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
Expand Down
1 change: 1 addition & 0 deletions adaptive/build.gradle
Expand Up @@ -87,6 +87,7 @@ dependencies {
api libs.androidx.window

implementation libs.napier
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
1 change: 1 addition & 0 deletions appcompat-theme/build.gradle
Expand Up @@ -84,6 +84,7 @@ android {
dependencies {
implementation libs.androidx.core
implementation libs.compose.material.material
implementation libs.kotlin.coroutines.android

api libs.androidx.appcompat

Expand Down
1 change: 1 addition & 0 deletions drawablepainter/build.gradle
Expand Up @@ -65,6 +65,7 @@ android {

dependencies {
implementation libs.compose.ui.ui
implementation libs.kotlin.coroutines.android
}

apply plugin: "com.vanniktech.maven.publish"
1 change: 1 addition & 0 deletions flowlayout/build.gradle
Expand Up @@ -84,6 +84,7 @@ android {
dependencies {
implementation libs.compose.foundation.foundation
implementation libs.compose.ui.util
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
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.26.2-SNAPSHOT
VERSION_NAME=0.26.2-beta

POM_DESCRIPTION=Utilities for Jetpack Compose

Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
@@ -1,16 +1,16 @@
[versions]

compose = "1.3.0-alpha03"
compose = "1.3.0-beta01"
composeCompiler = "1.3.0"
composesnapshot = "-" # a single character = no snapshot

# gradlePlugin and lint need to be updated together
gradlePlugin = "7.3.0-beta05"
gradlePlugin = "7.3.0-rc01"
lintMinCompose = "30.0.0"

ktlint = "0.45.2"
kotlin = "1.7.10"
coroutines = "1.6.0"
coroutines = "1.6.4"
okhttp = "3.12.13"
coil = "1.3.2"

Expand Down Expand Up @@ -72,15 +72,15 @@ androidx-navigation-testing = { module = "androidx.navigation:navigation-testing

napier = "io.github.aakira:napier:1.4.1"

androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidxtest" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest" }
androidx-test-core = "androidx.test:core-ktx:1.5.0-alpha02"
androidx-test-runner = "androidx.test:runner:1.5.0-alpha04"
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxtest" }
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxtest" }
androidx-test-orchestrator = "androidx.test:orchestrator:1.4.1"
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0"

# 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"
androidx-test-espressoCore = "androidx.test.espresso:espresso-core:3.5.0-alpha07"
androidx-test-espressoWeb = "androidx.test.espresso:espresso-web:3.5.0-alpha07"

junit = "junit:junit:4.13.2"
truth = "com.google.truth:truth:1.1.2"
Expand Down
2 changes: 2 additions & 0 deletions insets-ui/build.gradle
Expand Up @@ -90,6 +90,8 @@ dependencies {
api project(':insets')
api libs.compose.material.material

implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
// ======================
Expand Down
1 change: 1 addition & 0 deletions insets/build.gradle
Expand Up @@ -86,6 +86,7 @@ dependencies {
implementation libs.androidx.dynamicanimation

implementation libs.compose.foundation.foundation
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
1 change: 1 addition & 0 deletions navigation-animation/build.gradle
Expand Up @@ -75,6 +75,7 @@ dependencies {
implementation libs.compose.animation.animation
implementation libs.compose.foundation.foundation
implementation libs.compose.material.material
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
1 change: 1 addition & 0 deletions navigation-material/build.gradle
Expand Up @@ -74,6 +74,7 @@ dependencies {
api libs.androidx.navigation.compose
implementation libs.compose.foundation.foundation
implementation libs.compose.material.material
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
2 changes: 2 additions & 0 deletions pager-indicators/build.gradle
Expand Up @@ -85,6 +85,8 @@ dependencies {
api project(':pager')
api libs.compose.material.material

implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
// ======================
Expand Down
1 change: 1 addition & 0 deletions pager/build.gradle
Expand Up @@ -86,6 +86,7 @@ dependencies {
api libs.snapper

implementation libs.napier
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
Expand Up @@ -36,9 +36,11 @@ import androidx.test.filters.SdkSuppress
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice
import com.google.accompanist.permissions.test.PermissionsTestActivity
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

@Ignore
@OptIn(ExperimentalPermissionsApi::class)
@FlakyTest(detail = "https://github.com/google/accompanist/issues/490")
@SdkSuppress(minSdkVersion = 23)
Expand Down
Expand Up @@ -21,12 +21,14 @@ import androidx.test.filters.SdkSuppress
import androidx.test.rule.GrantPermissionRule
import com.google.accompanist.permissions.test.EmptyPermissionsTestActivity
import com.google.common.truth.Truth.assertThat
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

/**
* Simple tests that prove the data comes from the right place
*/
@Ignore
@OptIn(ExperimentalPermissionsApi::class)
@SdkSuppress(minSdkVersion = 23)
class MultiplePermissionsStateTest {
Expand Down
Expand Up @@ -21,12 +21,14 @@ import androidx.test.filters.SdkSuppress
import androidx.test.rule.GrantPermissionRule
import com.google.accompanist.permissions.test.EmptyPermissionsTestActivity
import com.google.common.truth.Truth.assertThat
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

/**
* Simple tests that prove the data comes from the right place
*/
@Ignore
@OptIn(ExperimentalPermissionsApi::class)
@SdkSuppress(minSdkVersion = 23)
class PermissionStateTest {
Expand Down
Expand Up @@ -30,9 +30,11 @@ import androidx.compose.ui.test.performClick
import androidx.test.filters.SdkSuppress
import kotlinx.coroutines.ExperimentalCoroutinesApi
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

@Ignore
@OptIn(ExperimentalPermissionsApi::class)
@SdkSuppress(minSdkVersion = 23)
class RequestMultiplePermissionsTest {
Expand Down
Expand Up @@ -26,12 +26,14 @@ import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.filters.FlakyTest
import androidx.test.filters.SdkSuppress
import kotlinx.coroutines.ExperimentalCoroutinesApi
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test

@Ignore
@OptIn(ExperimentalPermissionsApi::class)
@SdkSuppress(minSdkVersion = 23)
class RequestPermissionTest {
Expand Down Expand Up @@ -74,7 +76,7 @@ class RequestPermissionTest {
composeTestRule.onNodeWithText("No permission").assertIsDisplayed()
}

@OptIn(ExperimentalCoroutinesApi::class)
@FlakyTest
@Test
fun permissionTest_grantInTheBackground() {
composeTestRule.onNodeWithText("No permission").assertIsDisplayed()
Expand Down
1 change: 1 addition & 0 deletions placeholder-material/build.gradle
Expand Up @@ -74,6 +74,7 @@ dependencies {
implementation libs.compose.material.material
api project(':placeholder')
implementation libs.napier
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
1 change: 1 addition & 0 deletions placeholder/build.gradle
Expand Up @@ -90,6 +90,7 @@ dependencies {
implementation libs.compose.foundation.foundation
implementation libs.compose.ui.util
implementation libs.napier
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
2 changes: 1 addition & 1 deletion swiperefresh/build.gradle
Expand Up @@ -84,11 +84,11 @@ android {
dependencies {
implementation libs.compose.material.material
implementation libs.compose.ui.util
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
// ======================

androidTestImplementation project(':internal-testutils')
testImplementation project(':internal-testutils')

Expand Down
1 change: 1 addition & 0 deletions systemuicontroller/build.gradle
Expand Up @@ -89,6 +89,7 @@ android {
dependencies {
implementation libs.androidx.core
implementation libs.compose.ui.ui
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down
1 change: 1 addition & 0 deletions web/build.gradle
Expand Up @@ -86,6 +86,7 @@ dependencies {
implementation libs.compose.material.material
implementation libs.compose.ui.util
implementation libs.androidx.activity.compose
implementation libs.kotlin.coroutines.android

// ======================
// Test dependencies
Expand Down