diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 90eae86..fc81ffd 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 97626ba..286ca11 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 51fa3e5..cc04cd3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/README.md b/README.md index d3e41dc..1cd5f55 100644 --- a/README.md +++ b/README.md @@ -45,17 +45,17 @@ ZXingLite for Android 是ZXing的精简版,基于ZXing库优化扫码和生成 com.king.zxing zxing-lite - 1.1.1 + 1.1.2 pom ``` ### Gradle: ```gradle -implementation 'com.king.zxing:zxing-lite:1.1.1' +implementation 'com.king.zxing:zxing-lite:1.1.2' ``` ### Lvy: ```lvy - + ``` @@ -128,6 +128,9 @@ api 'com.google.zxing:core:3.3.3' ## 版本记录 +#### v1.1.2:2019-6-27 +* 优化部分细节,为迁移至AndroidX做准备 + #### v1.1.1:2019-5-20 * 支持扫二维码过小时,自动缩放 * 支持垂直条形码识别(增强条形码识别,默认不支持,需CaptureHelper.supportVerticalCode(true)开启) diff --git a/app/build.gradle b/app/build.gradle index 895345d..289f75a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,11 @@ android { lintOptions { abortOnError false } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index bee8036..e693aa5 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index fc5437f..e86aa59 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/lib/build.gradle b/lib/build.gradle index b2943d7..be23fad 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -24,6 +24,11 @@ android { abortOnError false warning 'InvalidPackage' } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } //task javadoc(type: Javadoc) { diff --git a/versions.gradle b/versions.gradle index 91d55fc..604ae02 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 10 -app_version.versionName = "1.1.1" +app_version.versionCode = 11 +app_version.versionName = "1.1.2" ext.app_version = app_version //build version