Skip to content

chore(samples): Update the liveness sample app to use the latest compose bom #224

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 16, 2025
Merged

chore(samples): Update the liveness sample app to use the latest compose bom #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[versions]
accompanist = "0.28.0"
agp = "8.7.2"
amplify = "2.27.0"
appcompat = "1.6.1"
androidx-core = "1.9.0"
androidx-junit = "1.1.4"
androidx-activity = "1.6.1"
androidx-navigation = "2.5.3"
binary-compatibility = "0.14.0"
cameraX = "1.2.0"
compose-bom = "2025.03.01"
Expand All @@ -26,6 +31,7 @@ zxing = "3.5.2"

[libraries]
# Amplify Dependencies
amplify-core-kotlin = { module = "com.amplifyframework:core-kotlin", version.ref = "amplify" }
amplify-api = { module = "com.amplifyframework:aws-api", version.ref = "amplify" }
amplify-auth = { module = "com.amplifyframework:aws-auth-cognito", version.ref = "amplify" }
amplify-predictions = { module = "com.amplifyframework:aws-predictions", version.ref = "amplify" }
Expand All @@ -34,27 +40,36 @@ amplify-predictions = { module = "com.amplifyframework:aws-predictions", version
android-desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }

# AndroidX
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
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-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" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }

# 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" }
androidx-compose-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }

# Kotlin
kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }

# TensorFlow
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" }
accompanist = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }

# Testing libraries
test-androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
Expand Down
42 changes: 24 additions & 18 deletions samples/liveness/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ android {
}
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
Expand All @@ -40,7 +41,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.3'
kotlinCompilerExtensionVersion '1.5.3'
}
packaging {
resources {
Expand All @@ -60,22 +61,27 @@ dependencies {
// Use this to use published version of Amplify UI
implementation "com.amplifyframework.ui:liveness:$LivenessVersion"

implementation "com.amplifyframework:core-kotlin:$amplifyVersion"
implementation "com.amplifyframework:aws-api:$amplifyVersion"
implementation "com.amplifyframework:aws-auth-cognito:$amplifyVersion"
implementation "com.amplifyframework:aws-predictions:$amplifyVersion"
implementation libs.amplify.core.kotlin
implementation libs.amplify.api
implementation libs.amplify.auth
implementation libs.amplify.predictions

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation "com.google.accompanist:accompanist-permissions:0.28.0"
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.navigation:navigation-compose:2.5.3'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.activity:activity-compose:1.6.1'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.compose.material3:material3:1.1.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
implementation platform(libs.androidx.compose.bom)

implementation libs.accompanist
implementation libs.kotlin.coroutines
implementation libs.kotlin.serialization.json
implementation libs.androidx.core
implementation libs.androidx.navigation.compose
implementation libs.androidx.lifecycle
implementation libs.androidx.activity.compose
implementation libs.androidx.compose.ui
implementation libs.androidx.compose.tooling.preview
implementation libs.androidx.compose.material
implementation libs.androidx.appcompat

coreLibraryDesugaring libs.android.desugar

debugImplementation libs.androidx.compose.tooling
debugImplementation libs.androidx.compose.ui.test.manifest
}
6 changes: 2 additions & 4 deletions samples/liveness/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
buildscript {
ext {
compose_version = '1.5.4'
amplifyVersion = '2.15.1'
LivenessVersion = '1.4.0'
}
repositories {
Expand All @@ -11,6 +9,6 @@ buildscript {
plugins {
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
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.10' apply false
}
5 changes: 5 additions & 0 deletions samples/liveness/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()

versionCatalogs {
create("libs") {
from(files("../../gradle/libs.versions.toml"))
}
}
}
rootProject.name = "Liveness-Sample"
Expand Down