diff --git a/app/build.gradle b/app/build.gradle index b83ccbc..76019ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ android { } kotlin { - jvmToolchain(21) + jvmToolchain(17) } buildFeatures { @@ -62,10 +62,10 @@ android { 'libs/tasks-vision/jni', 'libs/tasks-core/jni' ] - java.srcDirs += [ - 'libs/tasks-vision/vision_classes', - 'libs/tasks-core/core_classes' - ] + //java.srcDirs += [ + // 'libs/tasks-vision/vision_classes', + // 'libs/tasks-core/core_classes' + //] res.srcDirs += [ 'libs/tasks-vision/res', 'libs/tasks-core/res' @@ -79,6 +79,10 @@ android { version '3.22.1' } } + + packagingOptions { + pickFirst '**/*.jar' + } } dependencies { @@ -91,11 +95,11 @@ dependencies { androidTestImplementation libs.espresso.core - //implementation 'com.google.protobuf:protobuf-javalite:3.21.12' - //implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar') + implementation 'com.google.protobuf:protobuf-javalite:3.21.12' + implementation files('libs/tasks-vision.jar', 'libs/tasks-core.jar') - implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar']) - implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar']) + //implementation fileTree(dir: 'libs/tasks-vision', include: ['*.jar']) + //implementation fileTree(dir: 'libs/tasks-core', include: ['*.jar']) def camerax_version = '1.4.2'