依赖更新

bgaojin · Jul 30, 2021 · a7ea51d · a7ea51d
1 parent ab371be
commit a7ea51d
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 23 deletions.
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/AddressPicker/build.gradle b/AddressPicker/build.gradle
@@ -16,7 +16,7 @@ apply from: "${rootDir}/gradle/publish.gradle"
 
 dependencies {
     implementation androidxLibrary.annotation
-    implementation project(':Common')
-    implementation project(':WheelView')
-    implementation project(':WheelPicker')
+    api project(':Common')
+    api project(':WheelView')
+    api project(':WheelPicker')
 }
diff --git a/CalendarPicker/build.gradle b/CalendarPicker/build.gradle
@@ -18,5 +18,5 @@ dependencies {
     implementation androidxLibrary.annotation
     implementation androidxLibrary.core
     implementation androidxLibrary.recyclerview
-    implementation project(':Common')
+    api project(':Common')
 }
diff --git a/ColorPicker/build.gradle b/ColorPicker/build.gradle
@@ -16,5 +16,5 @@ apply from: "${rootDir}/gradle/publish.gradle"
 
 dependencies {
     implementation androidxLibrary.annotation
-    implementation project(':Common')
+    api project(':Common')
 }
diff --git a/FilePicker/build.gradle b/FilePicker/build.gradle
@@ -17,5 +17,5 @@ apply from: "${rootDir}/gradle/publish.gradle"
 dependencies {
     implementation androidxLibrary.annotation
     implementation androidxLibrary.recyclerview
-    implementation project(':Common')
+    api project(':Common')
 }
diff --git a/WheelPicker/build.gradle b/WheelPicker/build.gradle
@@ -16,6 +16,6 @@ apply from: "${rootDir}/gradle/publish.gradle"
 
 dependencies {
     implementation androidxLibrary.annotation
-    implementation project(':Common')
-    implementation project(':WheelView')
+    api project(':Common')
+    api project(':WheelView')
 }
diff --git a/app/src/main/res/layout/activity_picker_main.xml b/app/src/main/res/layout/activity_picker_main.xml
@@ -84,6 +84,13 @@
                 android:text="日历日期选择器"
                 android:textColor="#FF333333" />
 
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="onImagePicker"
+                android:text="图片选择器（相机+相册+裁剪）"
+                android:textColor="#FF333333" />
+
             <com.github.gzuliyujiang.wheelview.widget.WheelView
                 android:id="@+id/wheel_view"
                 android:layout_width="117dp"

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         maven { url 'https://repo1.maven.org/maven2/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 

diff --git a/gradle/app.gradle b/gradle/app.gradle
@@ -157,7 +157,7 @@ android.applicationVariants.all { variant ->
     //APK构建完成后，备份release版本及其混淆信息到指定目录
     tasks.all { it ->
         def maybeNeedCopy = false
-        if (it.name.startsWith("assemble")) {
+        if (it.name.startsWith("assemble") && it.name.endsWith("Release")) {
             maybeNeedCopy = true
         }
         if (maybeNeedCopy) {

diff --git a/gradle/common.gradle b/gradle/common.gradle
@@ -37,7 +37,8 @@ android {
             assets.srcDirs = ['src/main/assets']
             aidl.srcDirs = ['src/main/aidl']
             jni.srcDirs = ['cpp', 'jni', 'src/main/cpp', 'src/main/jni']
-            jniLibs.srcDirs = ['libs', 'src/main/jniLibs']
+            // See https://developer.android.google.cn/studio/releases/gradle-plugin#cmake-imported-targets
+            jniLibs.srcDirs = ['src/main/jniLibs']
         }
     }
 

diff --git a/gradle/config.gradle b/gradle/config.gradle
@@ -13,7 +13,7 @@
 
 ext {
 
-    //Android版本（4.4-19、5.0-21、6.0-23、7.0-24、8.0-26、9.0-28、10-29、11-30）
+    //Android版本（4.4-19、5.0-21、5.1-22、6.0-23、7.0-24、8.0-26、9.0-28、10-29、11-30）
     minSdkVersion = 19
     targetSdkVersion = 30
     compileSdkVersion = 30

diff --git a/gradle/dependency.gradle b/gradle/dependency.gradle
@@ -15,13 +15,13 @@ ext {
 
     // GitHub社区开源库
     library = [
-            logger                    : "com.orhanobut:logger:2.2.0",
+            orhanobut_logger          : "com.orhanobut:logger:2.2.0",
             xcrash                    : "com.iqiyi.xcrash:xcrash-android-lib:3.0.0",
             mmkv                      : "com.tencent:mmkv-static:1.2.7",
-            toast                     : "com.hjq:toast:8.8",
+            ToastUtils                : "com.github.getActivity:ToastUtils:9.5",
+            GsonFactory               : "com.github.getActivity:GsonFactory:5.2",
             photoview                 : "com.bm.photoview:library:1.4.1",
             material                  : "com.google.android.material:material:1.2.0",
-            flexbox                   : "com.google.android:flexbox:2.0.1",
             glide                     : "com.github.bumptech.glide:glide:4.12.0",
             picasso                   : "com.squareup.picasso:picasso:2.8",
             universalimageloader      : "com.nostra13.universalimageloader:universal-image-loader:1.9.5",
@@ -35,20 +35,21 @@ ext {
             SmartRefreshHeaderMaterial: "com.scwang.smart:refresh-header-material:2.0.3",
             SmartRefreshFooterClassic : "com.scwang.smart:refresh-footer-classics:2.0.3",
             SmartRefreshFooterBall    : "com.scwang.smart:refresh-footer-ball:2.0.3",
-            GifDrawable               : "pl.droidsonroids.gif:android-gif-drawable:1.2.22",
+            GifDrawable               : "pl.droidsonroids.gif:android-gif-drawable:1.2.23",
             aria                      : "com.arialyy.aria:core:3.8.15",
             banner                    : "com.youth.banner:banner:2.1.0",
             shimmer                   : "com.facebook.shimmer:shimmer:0.5.0",
             shapeofview               : "com.github.florent37:shapeofview:1.4.7",
-            lcardview                 : "org.linwg1988:lcardview:1.5.4",
             FlowLayoutManager         : "com.github.1002326270xc:LayoutManager-FlowLayout:v1.8",
-            FlexibleDivider           : "com.yqritc:recyclerview-flexibledivider:1.4.0",
-            wcdb                      : "com.tencent.wcdb:wcdb-android:1.0.8.2",
             GSYVideoPlayer            : "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer:v8.1.3-jitpack",
+            XPopup                    : "com.github.li-xiaojun:XPopup:2.4.3",
             //noinspection GradleDependency 注意：zxing 3.4.0开始，扫码/二维码生成只支持API>=24，若要支持Android7.0以下则需降级到3.3.3版本
             zxing                     : "com.google.zxing:core:3.3.3",
             zip4j                     : "net.lingala.zip4j:zip4j:2.8.0",
-            OAID                      : "com.github.gzu-liyujiang:Android_CN_OAID:4.1.3",
+            OAID                      : "com.github.gzu-liyujiang:Android_CN_OAID:4.2.1",
+            DebugLogger               : "com.github.gzu-liyujiang:Logger:1.3.0",
+            HttpRequest               : "com.github.gzu-liyujiang:HttpRequest:7.5.6",
+            ImageLoader               : "com.github.gzu-liyujiang:ImageLoader:3.0.1",
     ]
 
     // 谷歌支持库 https://developer.android.google.cn/jetpack/androidx/versions/stable-channel?hl=zh-cn
@@ -57,8 +58,9 @@ ext {
             core                  : "androidx.core:core:1.5.0-rc01",
             collection            : "androidx.collection:collection:1.1.0",
             multidex              : "androidx.multidex:multidex:2.0.0",
-            fragment              : "androidx.fragment:fragment:1.3.0",
-            appcompat             : "androidx.appcompat:appcompat:1.2.0",
+            activity              : "androidx.activity:activity:1.3.0-beta01",
+            fragment              : "androidx.fragment:fragment:1.3.4",
+            appcompat             : "androidx.appcompat:appcompat:1.3.0",
             localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
             recyclerview          : "androidx.recyclerview:recyclerview:1.1.0",
             recyclerview_selection: "androidx.recyclerview:recyclerview-selection:1.1.0",

diff --git a/settings.gradle b/settings.gradle
@@ -19,3 +19,4 @@ include ':AddressPicker'
 include ':FilePicker'
 include ':ColorPicker'
 include ':CalendarPicker'
+include ':ImagePicker'