From 9986c9bd25c3dcedb4e129f5bf913ffe406a63f1 Mon Sep 17 00:00:00 2001 From: jackjintai Date: Tue, 31 Mar 2020 18:12:37 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201=E3=80=81=E5=AE=8C=E5=96=84=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/app/build.gradle | 2 +- Android/build.gradle | 2 +- Android/config.gradle | 10 +++++----- Android/doraemonkit-leakcanary/build.gradle | 2 +- Android/doraemonkit-no-op/build.gradle | 2 +- Android/doraemonkit-weex-no-op/build.gradle | 2 +- Android/doraemonkit-weex/build.gradle | 2 +- Android/doraemonkit/build.gradle | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index a9bb9d5f..a2af9514 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation rootProject.ext.dependencies["junit"] implementation rootProject.ext.dependencies["multidex"] - implementation rootProject.ext.dependencies["appcompat-v7"] + implementation rootProject.ext.dependencies["appcompat"] implementation rootProject.ext.dependencies["design"] implementation rootProject.ext.dependencies["okhttp"] implementation rootProject.ext.dependencies["glide"] diff --git a/Android/build.gradle b/Android/build.gradle index 22affd5e..6b9a7025 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -17,7 +17,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.6.1' classpath 'com.novoda:bintray-release:0.9.2' classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:1000.0.2' - classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0' + classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/Android/config.gradle b/Android/config.gradle index 57f9415f..511dad06 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -17,19 +17,19 @@ ext { //app版本号 versionCode : 300, //dokit 插件版本号 - pluginVersionName : "1000.0.2", + pluginVersionName : "1000.0.3", //jcenter dokit版本号 jcenterArchivesVersionName: "3.0.0", //didi内部仓库版本号 - didiArchivesVersionName : "1000.0.21", + didiArchivesVersionName : "1000.0.22", versionName : "3.0.0", glide : "4.11.0", ] dependencies = [// ###### android library start ###### "multidex" : 'androidx.multidex:multidex:2.0.0', - "appcompat-v7" : 'androidx.appcompat:appcompat:1.0.0', - "cardview-v7" : 'androidx.cardview:cardview:1.0.0', - "recyclerview-v7" : 'androidx.recyclerview:recyclerview:1.0.0', + "appcompat" : 'androidx.appcompat:appcompat:1.0.0', + "cardview" : 'androidx.cardview:cardview:1.0.0', + "recyclerview" : 'androidx.recyclerview:recyclerview:1.0.0', "design" : 'com.google.android.material:material:1.0.0', //constraintLayout "constraintLayout" : 'androidx.constraintlayout:constraintlayout:1.1.3', diff --git a/Android/doraemonkit-leakcanary/build.gradle b/Android/doraemonkit-leakcanary/build.gradle index 41e17c45..9365f250 100644 --- a/Android/doraemonkit-leakcanary/build.gradle +++ b/Android/doraemonkit-leakcanary/build.gradle @@ -44,7 +44,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation rootProject.ext.dependencies["appcompat-v7"] + implementation rootProject.ext.dependencies["appcompat"] implementation 'androidx.test.ext:junit:1.1.1' //leakCanary implementation rootProject.ext.dependencies["haha"] diff --git a/Android/doraemonkit-no-op/build.gradle b/Android/doraemonkit-no-op/build.gradle index cdab0489..2705bd34 100644 --- a/Android/doraemonkit-no-op/build.gradle +++ b/Android/doraemonkit-no-op/build.gradle @@ -33,7 +33,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - //implementation rootProject.ext.dependencies["appcompat-v7"] + //implementation rootProject.ext.dependencies["appcompat"] //compileOnly rootProject.ext.dependencies["okio"] compileOnly rootProject.ext.dependencies["okhttp"] //三大图片框架 diff --git a/Android/doraemonkit-weex-no-op/build.gradle b/Android/doraemonkit-weex-no-op/build.gradle index dd34b28f..35443941 100644 --- a/Android/doraemonkit-weex-no-op/build.gradle +++ b/Android/doraemonkit-weex-no-op/build.gradle @@ -29,5 +29,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - //implementation rootProject.ext.dependencies["appcompat-v7"] + //implementation rootProject.ext.dependencies["appcompat"] } diff --git a/Android/doraemonkit-weex/build.gradle b/Android/doraemonkit-weex/build.gradle index 64338735..bf4d988f 100644 --- a/Android/doraemonkit-weex/build.gradle +++ b/Android/doraemonkit-weex/build.gradle @@ -35,7 +35,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies["appcompat-v7"] + implementation rootProject.ext.dependencies["appcompat"] implementation rootProject.ext.dependencies["design"] implementation rootProject.ext.dependencies["utilcode"] if (rootProject.ext.config["uploadArchives"]) { diff --git a/Android/doraemonkit/build.gradle b/Android/doraemonkit/build.gradle index 8d34894c..fcd44a17 100644 --- a/Android/doraemonkit/build.gradle +++ b/Android/doraemonkit/build.gradle @@ -41,9 +41,9 @@ dependencies { //noinspection GradleCompatible testImplementation rootProject.ext.dependencies["junit"] implementation rootProject.ext.dependencies["constraintLayout"] - implementation rootProject.ext.dependencies["appcompat-v7"] - implementation rootProject.ext.dependencies["cardview-v7"] - implementation(rootProject.ext.dependencies["recyclerview-v7"]) { + implementation rootProject.ext.dependencies["appcompat"] + implementation rootProject.ext.dependencies["cardview"] + implementation(rootProject.ext.dependencies["recyclerview"]) { exclude group: 'com.android.support' } implementation(rootProject.ext.dependencies["rootbeer-lib"]) { -- GitLab