提交 1c493dac 编写于 作者: J jackjintai

modify:

1、升级androidx
上级 beb75e70
...@@ -75,7 +75,7 @@ dependencies { ...@@ -75,7 +75,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation rootProject.ext.dependencies["multidex"] 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["design"]
implementation rootProject.ext.dependencies["okhttp"] implementation rootProject.ext.dependencies["okhttp"]
implementation rootProject.ext.dependencies["glide"] implementation rootProject.ext.dependencies["glide"]
......
...@@ -17,7 +17,7 @@ buildscript { ...@@ -17,7 +17,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.6.1' classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.novoda:bintray-release:0.9.2' classpath 'com.novoda:bintray-release:0.9.2'
classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:1000.0.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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
......
...@@ -17,19 +17,19 @@ ext { ...@@ -17,19 +17,19 @@ ext {
//app版本号 //app版本号
versionCode : 300, versionCode : 300,
//dokit 插件版本号 //dokit 插件版本号
pluginVersionName : "1000.0.2", pluginVersionName : "1000.0.3",
//jcenter dokit版本号 //jcenter dokit版本号
jcenterArchivesVersionName: "3.0.0", jcenterArchivesVersionName: "3.0.0",
//didi内部仓库版本号 //didi内部仓库版本号
didiArchivesVersionName : "1000.0.21", didiArchivesVersionName : "1000.0.22",
versionName : "3.0.0", versionName : "3.0.0",
glide : "4.11.0", glide : "4.11.0",
] ]
dependencies = [// ###### android library start ###### dependencies = [// ###### android library start ######
"multidex" : 'androidx.multidex:multidex:2.0.0', "multidex" : 'androidx.multidex:multidex:2.0.0',
"appcompat-v7" : 'androidx.appcompat:appcompat:1.0.0', "appcompat" : 'androidx.appcompat:appcompat:1.0.0',
"cardview-v7" : 'androidx.cardview:cardview:1.0.0', "cardview" : 'androidx.cardview:cardview:1.0.0',
"recyclerview-v7" : 'androidx.recyclerview:recyclerview:1.0.0', "recyclerview" : 'androidx.recyclerview:recyclerview:1.0.0',
"design" : 'com.google.android.material:material:1.0.0', "design" : 'com.google.android.material:material:1.0.0',
//constraintLayout //constraintLayout
"constraintLayout" : 'androidx.constraintlayout:constraintlayout:1.1.3', "constraintLayout" : 'androidx.constraintlayout:constraintlayout:1.1.3',
......
...@@ -44,7 +44,7 @@ android { ...@@ -44,7 +44,7 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') 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' implementation 'androidx.test.ext:junit:1.1.1'
//leakCanary //leakCanary
implementation rootProject.ext.dependencies["haha"] implementation rootProject.ext.dependencies["haha"]
......
...@@ -33,7 +33,7 @@ android { ...@@ -33,7 +33,7 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') 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["okio"]
compileOnly rootProject.ext.dependencies["okhttp"] compileOnly rootProject.ext.dependencies["okhttp"]
//三大图片框架 //三大图片框架
......
...@@ -29,5 +29,5 @@ android { ...@@ -29,5 +29,5 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
//implementation rootProject.ext.dependencies["appcompat-v7"] //implementation rootProject.ext.dependencies["appcompat"]
} }
...@@ -35,7 +35,7 @@ android { ...@@ -35,7 +35,7 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) 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["design"]
implementation rootProject.ext.dependencies["utilcode"] implementation rootProject.ext.dependencies["utilcode"]
if (rootProject.ext.config["uploadArchives"]) { if (rootProject.ext.config["uploadArchives"]) {
......
...@@ -41,9 +41,9 @@ dependencies { ...@@ -41,9 +41,9 @@ dependencies {
//noinspection GradleCompatible //noinspection GradleCompatible
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation rootProject.ext.dependencies["constraintLayout"] implementation rootProject.ext.dependencies["constraintLayout"]
implementation rootProject.ext.dependencies["appcompat-v7"] implementation rootProject.ext.dependencies["appcompat"]
implementation rootProject.ext.dependencies["cardview-v7"] implementation rootProject.ext.dependencies["cardview"]
implementation(rootProject.ext.dependencies["recyclerview-v7"]) { implementation(rootProject.ext.dependencies["recyclerview"]) {
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
implementation(rootProject.ext.dependencies["rootbeer-lib"]) { implementation(rootProject.ext.dependencies["rootbeer-lib"]) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册