From 26d60ae141430d91c43e0ae2cfd402e1827323f2 Mon Sep 17 00:00:00 2001 From: jenly1314 Date: Mon, 18 Nov 2019 11:09:21 +0800 Subject: [PATCH] Update README --- README.md | 10 +++++----- lib/build.gradle | 2 +- .../java/com/king/zxing/camera/AutoFocusManager.java | 1 - versions.gradle | 9 +++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5a000b8..4ccd21b 100644 --- a/README.md +++ b/README.md @@ -85,11 +85,11 @@ allprojects { ## 引入的库: ```gradle //AndroidX -compileOnly 'androidx.appcompat:appcompat:1.0.0+' +api 'androidx.appcompat:appcompat:1.1.0' api 'com.google.zxing:core:3.3.3' //Android -compileOnly 'com.android.support:appcompat-v7:28.0.0' +api 'com.android.support:appcompat-v7:28.0.0' api 'com.google.zxing:core:3.3.3' ``` @@ -162,9 +162,9 @@ api 'com.google.zxing:core:3.3.3' ## 版本记录 -#### v1.1.4:2019-11-15 -* 内置手电筒按钮,当光线太暗时,自动显示手电筒 fix(#58) -* 生成二维码时Logo支持自定义大小 fix(#62) +#### v1.1.4:2019-11-18 +* 内置手电筒按钮,当光线太暗时,自动显示手电筒 (fix#58) +* 生成二维码时Logo支持自定义大小 (fix#62) #### v1.1.3:2019-9-24 * 支持真实识别区域比例和识别区域偏移量可配置 diff --git a/lib/build.gradle b/lib/build.gradle index c71305d..18d3f9e 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -42,6 +42,6 @@ dependencies { androidTestImplementation deps.test.runner androidTestImplementation deps.test.espresso - compileOnly deps.support.appcompat + api deps.support.appcompat api deps.zxing } diff --git a/lib/src/main/java/com/king/zxing/camera/AutoFocusManager.java b/lib/src/main/java/com/king/zxing/camera/AutoFocusManager.java index 8817c33..5c9659c 100644 --- a/lib/src/main/java/com/king/zxing/camera/AutoFocusManager.java +++ b/lib/src/main/java/com/king/zxing/camera/AutoFocusManager.java @@ -29,7 +29,6 @@ import com.king.zxing.Preferences; -@SuppressWarnings("deprecation") // camera APIs final class AutoFocusManager implements Camera.AutoFocusCallback { private static final String TAG = AutoFocusManager.class.getSimpleName(); diff --git a/versions.gradle b/versions.gradle index 36a7f6e..21aa7db 100644 --- a/versions.gradle +++ b/versions.gradle @@ -16,8 +16,9 @@ ext.deps = [:] // App dependencies def versions = [:] -//support -versions.supportLibrary = "1.0.0+" +//AndroidX +versions.material = "1.2.0-alpha01" +versions.appcompat = "1.1.0" versions.constraintLayout = "1.1.3" //test @@ -35,8 +36,8 @@ ext.versions = versions //support def support = [:] -support.design = "com.google.android.material:material:$versions.supportLibrary" -support.appcompat = "androidx.appcompat:appcompat:$versions.supportLibrary" +support.design = "com.google.android.material:material:$versions.material" +support.appcompat = "androidx.appcompat:appcompat:$versions.appcompat" support.constraintlayout = "androidx.constraintlayout:constraintlayout:$versions.constraintLayout" deps.support = support