From 16efcbcff301d854d2a35e2f5deb5a2a5e8bdad6 Mon Sep 17 00:00:00 2001
From: xiangsilian <youmiss@163.com>
Date: Sun, 9 Nov 2025 10:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=89=8D=E7=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E8=83=BD=E6=89=93=E5=8C=85=E6=AD=A3=E7=A1=AE=E7=9A=84=20aar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

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'