diff --git a/.idea/misc.xml b/.idea/misc.xml index 39776a1..3d66c33 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,12 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 92ccfa8..42951d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,4 +41,11 @@ dependencies { implementation project(path: ':mlkit-scanner') // implementation 'com.github.maning0303:MNMLKitScanner:V1.0.0' + implementation 'com.google.mlkit:barcode-scanning:17.0.0' + implementation "androidx.camera:camera-core:1.0.2" + implementation "androidx.camera:camera-camera2:1.0.2" + implementation "androidx.camera:camera-lifecycle:1.0.2" + implementation "androidx.camera:camera-view:1.0.0-alpha25" + + } \ No newline at end of file diff --git a/config.gradle b/config.gradle index ef9bda9..366d189 100644 --- a/config.gradle +++ b/config.gradle @@ -7,8 +7,8 @@ ext { * 版本统一管理 */ versions = [ - versionCode : 100, //版本号 - versionName : "1.0.0", //版本名称 + versionCode : 101, //版本号 + versionName : "1.0.1", //版本名称 compileSdkVersion: 29, minSdkVersion : 21, diff --git a/mlkit-scanner/build.gradle b/mlkit-scanner/build.gradle index 2374698..299e72b 100644 --- a/mlkit-scanner/build.gradle +++ b/mlkit-scanner/build.gradle @@ -1,9 +1,6 @@ apply plugin: 'com.android.library' def versions = rootProject.ext.versions -def appId = rootProject.ext.appId -def dependenciesGoogle = rootProject.ext.dependenciesGoogle -def dependenciesOther = rootProject.ext.dependenciesOther android { compileSdkVersion versions.compileSdkVersion @@ -29,16 +26,12 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.1.0' + compileOnly 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.mlkit:barcode-scanning:16.2.0' - def camerax_version = '1.0.1'; - // The following line is optional, as the core library is included indirectly by camera-camera2 - implementation "androidx.camera:camera-core:${camerax_version}" - implementation "androidx.camera:camera-camera2:${camerax_version}" - // If you want to additionally use the CameraX Lifecycle library - implementation "androidx.camera:camera-lifecycle:${camerax_version}" - // If you want to additionally use the CameraX View class - implementation "androidx.camera:camera-view:1.0.0-alpha25" + compileOnly 'com.google.mlkit:barcode-scanning:17.0.0' + compileOnly "androidx.camera:camera-core:1.0.2" + compileOnly "androidx.camera:camera-camera2:1.0.2" + compileOnly "androidx.camera:camera-lifecycle:1.0.2" + compileOnly "androidx.camera:camera-view:1.0.0-alpha25" } \ No newline at end of file