From b73aeebc90267339a4851a68a6ebd396b7c66aea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:08:01 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
third-zxing/build.gradle | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/third-zxing/build.gradle b/third-zxing/build.gradle
index fd81dd7..c39f127 100644
--- a/third-zxing/build.gradle
+++ b/third-zxing/build.gradle
@@ -2,12 +2,12 @@
android {
- compileSdkVersion 29
+ compileSdkVersion 30
buildToolsVersion "29.0.1"
defaultConfig {
- minSdkVersion 21
- targetSdkVersion 26
+ minSdkVersion 23
+ targetSdkVersion 30
versionCode 1
versionName "1.0"
@@ -39,7 +39,7 @@
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
- implementation 'com.android.support:support-annotations:28.0.0'
+ api 'com.android.support:support-annotations:28.0.0'
// api 'com.android.support:appcompat-v7:28.0.0'
- implementation 'androidx.appcompat:appcompat:1.3.0'
+ api 'androidx.appcompat:appcompat:1.3.0'
}
--
Gitblit v1.8.0