diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index baf43bb..05e97ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,41 +1,27 @@ [versions] agp = "9.2.1" -kotlin = "2.2.21" -coreKtx = "1.17.0" +kotlin = "2.4.0" +coreKtx = "1.19.0" appcompat = "1.7.1" -material = "1.13.0" -composeBom = "2024.09.00" -activityCompose = "1.10.1" -lifecycleRuntimeKtx = "2.9.3" -camera = "1.3.1" +material = "1.14.0" +composeBom = "2026.06.01" +activityCompose = "1.13.0" +lifecycleRuntimeKtx = "2.11.0" +camera = "1.6.1" faceDetection = "16.1.7" -ejmlSimple = "0.44.0" -opencv = "4.13.0" -tensorflowLite = "2.17.0" -tensorflowLiteMetadata = "0.5.0" -tensorflowLiteSupport = "0.5.0" +ejmlSimple = "0.46.0" +opencv = "5.0.0.1" +litert = "1.4.2" +litertSupport = "1.4.2" truth = "1.4.5" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" -coroutines = "1.10.2" +coroutines = "1.11.0" [libraries] -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } -tensorflow-lite = { module = "org.tensorflow:tensorflow-lite", version.ref = "tensorflowLite" } -tensorflow-lite-metadata = { module = "org.tensorflow:tensorflow-lite-metadata", version.ref = "tensorflowLiteMetadata" } -tensorflow-lite-support = { module = "org.tensorflow:tensorflow-lite-support", version.ref = "tensorflowLiteSupport" } -face-detection = { module = "com.google.mlkit:face-detection", version.ref = "faceDetection" } -ejml-simple = { module = "org.ejml:ejml-simple", version.ref = "ejmlSimple" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } -opencv = { module = "org.opencv:opencv", version.ref = "opencv" } -truth = { module = "com.google.truth:truth", version.ref = "truth" } -junit = { group = "junit", name = "junit", version.ref = "junit" } - androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } @@ -47,15 +33,28 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } camera-core = { group = "androidx.camera", name = "camera-core", version.ref = "camera" } camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "camera" } camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "camera" } camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "camera" } +litert = { group = "com.google.ai.edge.litert", name = "litert", version.ref = "litert" } +litert-support = { group = "com.google.ai.edge.litert", name = "litert-support", version.ref = "litertSupport" } + +face-detection = { group = "com.google.mlkit", name = "face-detection", version.ref = "faceDetection" } +ejml-simple = { group = "org.ejml", name = "ejml-simple", version.ref = "ejmlSimple" } +opencv = { group = "org.opencv", name = "opencv", version.ref = "opencv" } + +test-junit = { group = "junit", name = "junit", version.ref = "junit" } +test-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +test-truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } +test-coroutine = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } +test-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } + [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } -jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 40a6b7b..2077dad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 02 14:49:35 EEST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index e05efbf..04bc46d 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -8,7 +8,7 @@ plugins { android { namespace = "com.simprints.sample" - compileSdk = 36 + compileSdk = 37 defaultConfig { applicationId = "com.simprints.sample" @@ -61,11 +61,11 @@ dependencies { implementation(libs.camera.lifecycle) implementation(libs.camera.view) - testImplementation(libs.junit) - testImplementation(libs.truth) - testImplementation(libs.kotlinx.coroutines.test) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) + testImplementation(libs.test.junit) + testImplementation(libs.test.truth) + testImplementation(libs.test.coroutine) + androidTestImplementation(libs.test.androidx.junit) + androidTestImplementation(libs.test.espresso) androidTestImplementation(platform(libs.androidx.compose.bom)) androidTestImplementation(libs.androidx.compose.ui.test.junit4) } diff --git a/settings.gradle.kts b/settings.gradle.kts index e56f513..5b24565 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,7 @@ pluginManagement { } } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } dependencyResolutionManagement { diff --git a/simface/build.gradle.kts b/simface/build.gradle.kts index 22217b9..3b0d62a 100644 --- a/simface/build.gradle.kts +++ b/simface/build.gradle.kts @@ -15,7 +15,7 @@ version = projectVersion android { namespace = "$projectGroupId.$projectArtifactId" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 23 @@ -45,9 +45,8 @@ dependencies { api(project(":simq")) // Tensorflow versions that works with Edgeface - api(libs.tensorflow.lite.support) - api(libs.tensorflow.lite.metadata) - api(libs.tensorflow.lite) + api(libs.litert) + api(libs.litert.support) // Face Detection and quality api(libs.face.detection) @@ -55,10 +54,10 @@ dependencies { // For face alignment api(libs.ejml.simple) - androidTestImplementation(libs.truth) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) - androidTestImplementation(libs.kotlinx.coroutines.test) + androidTestImplementation(libs.test.truth) + androidTestImplementation(libs.test.androidx.junit) + androidTestImplementation(libs.test.espresso) + androidTestImplementation(libs.test.coroutine) } publishing { diff --git a/simq/build.gradle.kts b/simq/build.gradle.kts index 774fe21..7111d6f 100644 --- a/simq/build.gradle.kts +++ b/simq/build.gradle.kts @@ -14,7 +14,7 @@ version = projectVersion android { namespace = "com.simprints.simq" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 23 @@ -52,10 +52,10 @@ dependencies { implementation(libs.material) api(libs.opencv) - androidTestImplementation(libs.truth) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) - androidTestImplementation(libs.kotlinx.coroutines.test) + androidTestImplementation(libs.test.truth) + androidTestImplementation(libs.test.androidx.junit) + androidTestImplementation(libs.test.espresso) + androidTestImplementation(libs.test.coroutine) } publishing {