Merge pull request #1523 from google/ben/upgrade_beta

Upgrade to Compose 1.4.0-rc01

adaptive/src/sharedTest/kotlin/com/google/accompanist/adaptive/TwoPaneTest.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toAndroidRect
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.platform.LocalDensity
@@ -1578,7 +1577,12 @@ private fun fakeDisplayFeatures(
         }
 
         FoldingFeature(
-            windowBounds = bounds.toAndroidRect(),
+            windowBounds = android.graphics.Rect(
+                bounds.left.toInt(),
+                bounds.top.toInt(),
+                bounds.right.toInt(),
+                bounds.bottom.toInt()
+            ),
             center = center,
             size = size,
             state = localFoldingFeature.state,

gradle.properties

@@ -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.29.2-SNAPSHOT
+VERSION_NAME=0.29.2-rc
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 
-compose = "1.4.0-alpha05"
-composeCompiler = "1.4.2"
+compose = "1.4.0-rc01"
+composeCompiler = "1.4.3"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot
 
@@ -16,7 +16,7 @@ okhttp = "3.12.13"
 coil = "1.3.2"
 
 androidxtest = "1.4.0"
-androidxnavigation = "2.5.3"
+androidxnavigation = "2.6.0-alpha07"
 androidxWindow = "1.0.0"
 
 [libraries]
@@ -64,8 +64,9 @@ androidx-core = "androidx.core:core-ktx:1.8.0"
 androidx-activity-compose = "androidx.activity:activity-compose:1.5.1"
 androidx-fragment = "androidx.fragment:fragment-ktx:1.5.1"
 androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03"
-androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-beta01"
 androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common-java8:2.6.0"
 androidx-window = { module = "androidx.window:window", version.ref = "androidxWindow" }
 androidx-window-testing = { module = "androidx.window:window-testing", version.ref = "androidxWindow" }
 

web/build.gradle

@@ -94,8 +94,12 @@ metalava {
 dependencies {
     implementation libs.compose.material.material
     implementation libs.compose.ui.util
+    implementation libs.androidx.lifecycle.runtime
     implementation libs.androidx.activity.compose
+
+    // TODO: Remove when fixed https://github.com/gradle/gradle/issues/24037
     implementation libs.kotlin.coroutines.android
+    implementation libs.androidx.lifecycle.common
 
     // ======================
     // Test dependencies