Merge pull request #1495 from google/ben/upgrade1.4-5

Upgrade to Compose 1.4-alpha05

Author: bentrengrove

.idea/inspectionProfiles/ktlint.xml

@@ -32,7 +32,7 @@ android {
  defaultConfig {
  minSdkVersion 21
  // targetSdkVersion has no effect for libraries. This is only used for the test APK
- targetSdkVersion 32
+ targetSdkVersion 33
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }
 

.idea/kotlinc.xml

@@ -60,7 +60,7 @@ open class LayoutTest {
  size: Ref<IntSize>,
  position: Ref<Offset>,
  positionedLatch: CountDownLatch
- ): Modifier = onGloballyPositioned { coordinates ->
+ ): Modifier = this then onGloballyPositioned { coordinates ->
  size.value = IntSize(coordinates.size.width, coordinates.size.height)
  position.value = coordinates.localToRoot(Offset(0f, 0f))
  positionedLatch.countDown()

adaptive/build.gradle

@@ -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.1-SNAPSHOT
+VERSION_NAME=0.29.1-alpha
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

flowlayout/src/sharedTest/kotlin/com/google/accompanist/flowlayout/LayoutTest.kt

@@ -1,7 +1,7 @@
 [versions]
 
-compose = "1.4.0-alpha04"
-composeCompiler = "1.4.0-alpha02"
+compose = "1.4.0-alpha05"
+composeCompiler = "1.4.0"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot
 
@@ -10,7 +10,7 @@ gradlePlugin = "7.3.1"
 lintMinCompose = "30.0.0"
 
 ktlint = "0.45.2"
-kotlin = "1.7.21"
+kotlin = "1.8.0"
 coroutines = "1.6.4"
 okhttp = "3.12.13"
 coil = "1.3.2"

gradle.properties

@@ -51,7 +51,7 @@ For more migration information, please visit https://google.github.io/accompanis
  "androidx.compose.foundation.layout.systemBarsPadding"
  )
 )
-inline fun Modifier.systemBarsPadding(enabled: Boolean = true): Modifier = composed {
+inline fun Modifier.systemBarsPadding(enabled: Boolean = true): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.systemBars,
@@ -91,7 +91,7 @@ inline fun Modifier.systemBarsPadding(
  top: Boolean = true,
  end: Boolean = true,
  bottom: Boolean = true,
-): Modifier = composed {
+): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.systemBars,
@@ -117,7 +117,7 @@ For more migration information, please visit https://google.github.io/accompanis
  "androidx.compose.foundation.layout.statusBarsPadding"
  )
 )
-inline fun Modifier.statusBarsPadding(): Modifier = composed {
+inline fun Modifier.statusBarsPadding(): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.statusBars,
@@ -152,7 +152,7 @@ inline fun Modifier.navigationBarsPadding(
  bottom: Boolean = true,
  start: Boolean = true,
  end: Boolean = true,
-): Modifier = composed {
+): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.navigationBars,
@@ -181,7 +181,7 @@ For more migration information, please visit https://google.github.io/accompanis
  "androidx.compose.foundation.layout.imePadding"
  )
 )
-inline fun Modifier.imePadding(): Modifier = composed {
+inline fun Modifier.imePadding(): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.ime,
@@ -220,7 +220,7 @@ inline fun Modifier.cutoutPadding(
  top: Boolean = true,
  end: Boolean = true,
  bottom: Boolean = true,
-): Modifier = composed {
+): Modifier = this then composed {
  padding(
  rememberInsetsPaddingValues(
  insets = LocalWindowInsets.current.displayCutout,
@@ -248,7 +248,7 @@ For more migration information, please visit https://google.github.io/accompanis
  "androidx.compose.foundation.layout.imePadding"
  )
 )
-inline fun Modifier.navigationBarsWithImePadding(): Modifier = composed {
+inline fun Modifier.navigationBarsWithImePadding(): Modifier = this then composed {
  val ime = LocalWindowInsets.current.ime
  val navBars = LocalWindowInsets.current.navigationBars
  val insets = remember(ime, navBars) { derivedWindowInsetsTypeOf(ime, navBars) }

gradle/libs.versions.toml

@@ -97,7 +97,7 @@ For more migration information, please visit https://google.github.io/accompanis
 )
 fun Modifier.statusBarsHeight(
  additional: Dp = 0.dp,
-): Modifier = composed {
+): Modifier = this then composed {
  InsetsSizeModifier(
  insetsType = LocalWindowInsets.current.statusBars,
  heightSide = VerticalSide.Top,
@@ -144,7 +144,7 @@ For more migration information, please visit https://google.github.io/accompanis
 )
 fun Modifier.navigationBarsHeight(
  additional: Dp = 0.dp
-): Modifier = composed {
+): Modifier = this then composed {
  InsetsSizeModifier(
  insetsType = LocalWindowInsets.current.navigationBars,
  heightSide = VerticalSide.Bottom,
@@ -198,7 +198,7 @@ For more migration information, please visit https://google.github.io/accompanis
 fun Modifier.navigationBarsWidth(
  side: HorizontalSide,
  additional: Dp = 0.dp
-): Modifier = composed {
+): Modifier = this then composed {
  InsetsSizeModifier(
  insetsType = LocalWindowInsets.current.navigationBars,
  widthSide = side,

insets/src/main/java/com/google/accompanist/insets/Padding.kt

@@ -16,6 +16,7 @@
 
 package com.google.accompanist.navigation.animation
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedVisibilityScope
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
@@ -24,6 +25,7 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDestination
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
+import kotlin.collections.forEach
 
 /**
  * Navigator that navigates through [Composable]s. Every destination using this Navigator must
@@ -39,6 +41,7 @@ public class AnimatedComposeNavigator : Navigator<AnimatedComposeNavigator.Desti
 
  internal val isPop = mutableStateOf(false)
 
+ @SuppressLint("NewApi") // b/187418647
  override fun navigate(
  entries: List<NavBackStackEntry>,
  navOptions: NavOptions?,

insets/src/main/java/com/google/accompanist/insets/Size.kt

@@ -16,6 +16,7 @@
 
 package com.google.accompanist.navigation.animation
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedContentScope
 import androidx.compose.animation.AnimatedVisibilityScope
 import androidx.compose.animation.EnterTransition
@@ -42,6 +43,7 @@ import androidx.navigation.get
  * @param popExitTransition callback to determine the destination's popExit transition
  * @param content composable for the destination
  */
+@SuppressLint("NewApi") // b/187418647
 @ExperimentalAnimationApi
 public fun NavGraphBuilder.composable(
  route: String,