fix(authenticator): Update to Compose 1.5.4 (#80)

Co-authored-by: Tyler Roach <[email protected]>

Author: mattcreaser

authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/Authenticator.kt

@@ -16,15 +16,14 @@
 package com.amplifyframework.ui.authenticator.ui
 
 import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.rememberScrollState
@@ -76,7 +75,6 @@ import com.amplifyframework.ui.authenticator.util.AuthenticatorMessage
  * @param onDisplayMessage Override the default handling for displaying an [AuthenticatorMessage].
  * @param content The content shown when the Authenticator reaches the [SignedInState].
  */
-@OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun Authenticator(
     modifier: Modifier = Modifier,
@@ -111,7 +109,8 @@ fun Authenticator(
         Box(modifier = modifier) {
             AnimatedContent(
                 targetState = stepState,
-                transitionSpec = { defaultTransition() }
+                transitionSpec = { defaultTransition() },
+                label = "AuthenticatorContentTransition"
             ) { targetState ->
                 Column(
                     modifier = Modifier.verticalScroll(rememberScrollState())
@@ -152,16 +151,14 @@ fun Authenticator(
     }
 }
 
-@OptIn(ExperimentalAnimationApi::class)
-internal fun AnimatedContentScope<AuthenticatorStepState>.defaultTransition(): ContentTransform {
+internal fun AnimatedContentTransitionScope<AuthenticatorStepState>.defaultTransition(): ContentTransform {
     // Show reverse transition when going back to signIn
     if (targetState is SignInState && initialState != LoadingState) {
-        return fadeIn(animationSpec = tween(220, delayMillis = 90)) with
-            scaleOut(targetScale = 0.92f, animationSpec = tween(90)) +
-                fadeOut(animationSpec = tween(90))
+        return fadeIn(animationSpec = tween(220, delayMillis = 90)) togetherWith
+            scaleOut(targetScale = 0.92f, animationSpec = tween(90)) + fadeOut(animationSpec = tween(90))
     }
     // Show forward transition for all others
     return fadeIn(animationSpec = tween(220, delayMillis = 90)) +
-        scaleIn(initialScale = 0.92f, animationSpec = tween(220, delayMillis = 90)) with
+        scaleIn(initialScale = 0.92f, animationSpec = tween(220, delayMillis = 90)) togetherWith
         fadeOut(animationSpec = tween(90))
 }

build-logic/plugins/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -76,7 +76,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
         }
 
         extension.apply {
-            compileSdk = 33
+            compileSdk = 34
 
             buildFeatures {
                 buildConfig = true
@@ -102,6 +102,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 warningsAsErrors = true
                 abortOnError = true
                 enable += listOf("UnusedResources", "NewerVersionAvailable")
+                disable += listOf("GradleDependency")
             }
 
             compileOptions {

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-agp = "8.0.0"
+agp = "8.1.3"
 amplify = "2.14.5"
 cameraX = "1.2.0"
-compose = "1.3.2"
+compose = "1.5.4"
 coroutines = "1.7.3"
 lifecycle = "2.4.0"
 kotlin = "1.8.10"
 ktlint = "11.0.0"
 kover = "0.7.2"
 kotest = "5.7.1"
-material3 = "1.1.0"
+material3 = "1.1.2"
 paparazzi = "1.2.0"
 turbine = "1.0.0"
 

samples/authenticator/app/build.gradle

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.amplifyframework.ui.sample.authenticator'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.amplifyframework.ui.sample.authenticator"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1"
 

samples/authenticator/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '8.0.0' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }

samples/liveness/app/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace 'com.amplifyframework.ui.sample.liveness'
-    compileSdk 33
+    compileSdk 34
 
     buildFeatures {
         buildConfig true

samples/liveness/build.gradle

@@ -9,8 +9,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '8.0.0' apply false
+    id 'com.android.application' version '8.1.3' apply false
+    id 'com.android.library' version '8.1.3' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10' apply false
 }