diff --git a/authenticator-screenshots/build.gradle.kts b/authenticator-screenshots/build.gradle.kts index fcef70c7..a0373ea9 100644 --- a/authenticator-screenshots/build.gradle.kts +++ b/authenticator-screenshots/build.gradle.kts @@ -27,6 +27,8 @@ android { } dependencies { + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.bundles.compose) implementation(libs.test.mockk) implementation(projects.authenticator) diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_default_state.png index aef07ca8..815f187d 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_username_not_found.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_username_not_found.png index 5818741c..579fb7c2 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_username_not_found.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_PasswordResetScreenshots_username_not_found.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_default.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_default.png index 781846e3..8ff47960 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_default.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_default.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_incorrect_code.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_incorrect_code.png index 1ac94933..858f28c4 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_incorrect_code.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_email_mfa_incorrect_code.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_default.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_default.png index 48a998b4..2a6f2d18 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_default.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_default.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_incorrect_code.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_incorrect_code.png index 847c680e..aa3eaef8 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_incorrect_code.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmMfa_sign_in_confirm_sms_mfa_incorrect_code.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_default_state.png index 9b1a24fa..8579db2f 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_invalid_code.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_invalid_code.png index b12b835d..b6fac089 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_invalid_code.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInConfirmTotpCodeScreenshots_invalid_code.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithEmailSetupScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithEmailSetupScreenshots_default_state.png index 54134d06..7608db24 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithEmailSetupScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithEmailSetupScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSelectionScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSelectionScreenshots_default_state.png index dd99d0d5..0d58a407 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSelectionScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSelectionScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSetupSelection_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSetupSelection_default_state.png index b1bae586..7c5bcf25 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSetupSelection_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithMfaSetupSelection_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_default_state.png index 6cb64d76..f7f7d8c9 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_invalid_code.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_invalid_code.png index 579ad57e..91b362b4 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_invalid_code.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInContinueWithTotpSetupScreenshots_invalid_code.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_default_state.png index 250ed537..b4e35cb7 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_password_visible.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_password_visible.png index b112beb2..d0e3ebbc 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_password_visible.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_password_visible.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_ready_to_submit.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_ready_to_submit.png index b222f2cb..23c0f8a2 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_ready_to_submit.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_ready_to_submit.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_username_not_found.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_username_not_found.png index 8b01b424..3b917146 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_username_not_found.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignInScreenshots_username_not_found.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_default_state.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_default_state.png index 5ed89d46..cd3d4523 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_default_state.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_default_state.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_email.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_email.png index 74388999..ecea9c30 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_email.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_email.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_password.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_password.png index f2a7ac6a..5cddfdf7 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_password.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_invalid_password.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_password_visible.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_password_visible.png index e3de0769..fa5564eb 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_password_visible.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_password_visible.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_passwords_do_not_match.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_passwords_do_not_match.png index 38106180..d1e8aa24 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_passwords_do_not_match.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_passwords_do_not_match.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_ready_to_submit.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_ready_to_submit.png index ca788dca..b6063a86 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_ready_to_submit.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_ready_to_submit.png differ diff --git a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_username_exists.png b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_username_exists.png index 94d28370..0c128822 100644 Binary files a/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_username_exists.png and b/authenticator-screenshots/src/test/snapshots/images/com.amplifyframework.ui.authenticator.ui_SignUpScreenshots_username_exists.png differ diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index fb8b029f..44fa12e7 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -14,6 +14,8 @@ android { } dependencies { + implementation(platform(libs.androidx.compose.bom)) + api(libs.amplify.auth) implementation(libs.bundles.compose) diff --git a/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordResetConfirm.kt b/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordResetConfirm.kt index 0f77459c..e2406576 100644 --- a/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordResetConfirm.kt +++ b/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordResetConfirm.kt @@ -49,7 +49,7 @@ fun PasswordResetConfirm( .padding(horizontal = 16.dp) ) { headerContent(state) - deliveryNoticeContent(details = state.deliveryDetails) + deliveryNoticeContent(state.deliveryDetails) AuthenticatorForm( state = state.form ) diff --git a/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt b/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt index c6e06c32..f6859134 100644 --- a/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt +++ b/authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt @@ -28,8 +28,8 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ModalBottomSheet @@ -70,10 +70,7 @@ import java.util.Locale import kotlinx.coroutines.launch @Stable -private class PhoneNumberFieldState( - initialRegionCode: String, - initialNumber: String = "" -) { +private class PhoneNumberFieldState(initialRegionCode: String, initialNumber: String = "") { var region by mutableStateOf(regionMap[initialRegionCode] ?: regionMap["US"]!!) var number by mutableStateOf(initialNumber) var expanded by mutableStateOf(false) @@ -137,9 +134,7 @@ internal fun PhoneInputField( @OptIn(ExperimentalMaterial3Api::class) @Composable -private fun DialCodeSelector( - state: PhoneNumberFieldState -) { +private fun DialCodeSelector(state: PhoneNumberFieldState) { Text( modifier = Modifier .clickable { state.expanded = true } @@ -195,11 +190,7 @@ private fun DialCodeSelector( } @Composable -private fun RegionSearchBox( - value: String, - onValueChange: (String) -> Unit, - modifier: Modifier = Modifier -) { +private fun RegionSearchBox(value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier) { OutlinedTextField( modifier = modifier, value = value, @@ -227,11 +218,7 @@ private fun RegionSearchBox( } @Composable -private fun LazyItemScope.RegionItem( - showDivider: Boolean, - region: Region, - onClick: (Region) -> Unit -) { +private fun LazyItemScope.RegionItem(showDivider: Boolean, region: Region, onClick: (Region) -> Unit) { Row( modifier = Modifier .fillParentMaxWidth() @@ -249,6 +236,6 @@ private fun LazyItemScope.RegionItem( } if (showDivider) { - Divider(modifier = Modifier.padding(horizontal = 16.dp)) + HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp)) } } diff --git a/build-logic/plugins/src/main/kotlin/LicensesConventionPlugin.kt b/build-logic/plugins/src/main/kotlin/LicensesConventionPlugin.kt index 1d33abfe..c5f3cc49 100644 --- a/build-logic/plugins/src/main/kotlin/LicensesConventionPlugin.kt +++ b/build-logic/plugins/src/main/kotlin/LicensesConventionPlugin.kt @@ -33,9 +33,6 @@ class LicensesConventionPlugin : Plugin { allowUrl("http://aws.amazon.com/apache2.0") allowUrl("https://developer.android.com/studio/terms.html") - ignoreDependencies("javax.annotation", "javax.annotation-api") { - because("Transitive dependency for androidx.test.espresso:espresso-core") - } ignoreDependencies("org.junit", "junit-bom") { because("Unit Testing Dependency") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c596d025..7f43e69b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,26 @@ [versions] -agp = "8.1.4" +agp = "8.7.2" amplify = "2.27.0" +androidx-junit = "1.1.4" binary-compatibility = "0.14.0" cameraX = "1.2.0" -compose = "1.5.4" +compose-bom = "2025.03.01" coroutines = "1.7.3" +desugar = "1.2.0" +futures = "1.1.0" +junit = "4.13.2" kotest = "5.7.1" kotlin = "1.9.10" kover = "0.7.2" ktlint = "11.0.0" licensee = "1.7.0" lifecycle = "2.4.0" -material3 = "1.1.2" -paparazzi = "1.2.0" +mockk = "1.13.4" +paparazzi = "1.3.5" +robolectric = "4.9.2" +serialization = "1.3.3" +tensorflow = "2.0.0" +tensorflow-support = "0.3.0" turbine = "1.0.0" zxing = "3.5.2" @@ -23,38 +31,40 @@ amplify-auth = { module = "com.amplifyframework:aws-auth-cognito", version.ref = amplify-predictions = { module = "com.amplifyframework:aws-predictions", version.ref = "amplify" } # Android -android-desugar = "com.android.tools:desugar_jdk_libs:1.1.8" +android-desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" } # AndroidX androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "cameraX" } androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraX" } androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "cameraX" } -androidx-compose-material = { module = "androidx.compose.material3:material3", version.ref = "material3" } -androidx-compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } -androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -androidx-futures = "androidx.concurrent:concurrent-futures:1.1.0" +androidx-futures = { module = "androidx.concurrent:concurrent-futures", version.ref = "futures" } androidx-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } + +# Compose +androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" } +androidx-compose-material = { module = "androidx.compose.material3:material3" } +androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling" } # Kotlin -kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3" +kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } # TensorFlow -tensorflow = "org.tensorflow:tensorflow-lite:2.0.0" -tensorflow-support = "org.tensorflow:tensorflow-lite-support:0.3.0" +tensorflow = { module = "org.tensorflow:tensorflow-lite", version.ref = "tensorflow" } +tensorflow-support = {module = "org.tensorflow:tensorflow-lite-support", version.ref = "tensorflow-support" } # Other zxing = { module = "com.google.zxing:core", version.ref = "zxing" } # Testing libraries -test-androidx-junit = "androidx.test.ext:junit:1.1.4" -test-compose-junit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" } -test-compose-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" } +test-androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" } +test-compose-junit = { module = "androidx.compose.ui:ui-test-junit4" } +test-compose-manifest = { module = "androidx.compose.ui:ui-test-manifest" } test-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -test-espresso = "androidx.test.espresso:espresso-core:3.5.1" -test-junit = "junit:junit:4.13.2" +test-junit = { module = "junit:junit", version.ref = "junit" } test-kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" } -test-mockk = "io.mockk:mockk:1.13.4" -test-robolectric = "org.robolectric:robolectric:4.9.2" +test-mockk = { module = "io.mockk:mockk", version.ref = "mockk" } +test-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } test-turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" } # Dependencies for convention plugins @@ -75,7 +85,6 @@ test = [ "test-robolectric", "test-compose-junit", "test-compose-manifest", - "test-espresso", "test-coroutines", "test-kotest-assertions", "test-turbine" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a0b92f..19cfad96 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/liveness/build.gradle.kts b/liveness/build.gradle.kts index 4e88ed3f..0e844e76 100644 --- a/liveness/build.gradle.kts +++ b/liveness/build.gradle.kts @@ -38,9 +38,14 @@ android { androidResources { noCompress += "tflite" } + + compileOptions { + isCoreLibraryDesugaringEnabled = true + } } dependencies { + implementation(platform(libs.androidx.compose.bom)) api(libs.amplify.api) api(libs.amplify.predictions) @@ -56,5 +61,7 @@ dependencies { implementation(libs.tensorflow) implementation(libs.tensorflow.support) + coreLibraryDesugaring(libs.android.desugar) + testImplementation(projects.testing) } diff --git a/samples/authenticator/build.gradle b/samples/authenticator/build.gradle index 4c72874a..ece200db 100644 --- a/samples/authenticator/build.gradle +++ b/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.1.4' apply false - id 'com.android.library' version '8.1.4' apply false + id 'com.android.application' version '8.7.2' apply false + id 'com.android.library' version '8.7.2' apply false id 'org.jetbrains.kotlin.android' version '1.9.10' apply false } diff --git a/samples/authenticator/gradle/wrapper/gradle-wrapper.properties b/samples/authenticator/gradle/wrapper/gradle-wrapper.properties index 84a0b92f..19cfad96 100644 --- a/samples/authenticator/gradle/wrapper/gradle-wrapper.properties +++ b/samples/authenticator/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/liveness/build.gradle b/samples/liveness/build.gradle index a8644432..92012ac9 100644 --- a/samples/liveness/build.gradle +++ b/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.1.4' apply false - id 'com.android.library' version '8.1.4' apply false + id 'com.android.application' version '8.7.2' apply false + id 'com.android.library' version '8.7.2' 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 } diff --git a/samples/liveness/gradle/wrapper/gradle-wrapper.properties b/samples/liveness/gradle/wrapper/gradle-wrapper.properties index 84a0b92f..19cfad96 100644 --- a/samples/liveness/gradle/wrapper/gradle-wrapper.properties +++ b/samples/liveness/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts index 61304aa9..f7f16d80 100644 --- a/testing/build.gradle.kts +++ b/testing/build.gradle.kts @@ -22,6 +22,8 @@ android { } dependencies { + implementation(platform(libs.androidx.compose.bom)) + api(libs.bundles.test) implementation(libs.bundles.compose) }