Skip to content

Commit

Permalink
升级Glide-4.4.0
Browse files Browse the repository at this point in the history 
升级Glide-4.4.0
  • Loading branch information
@goldze
goldze committed Jan 3, 2018
1 parent f32cd78 commit 8216c6f
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ allprojects {
```gradle
dependencies {
...
compile 'com.github.goldze:MVVMHabit:1.2.6.0'
api 'com.github.goldze:MVVMHabit:1.2.6.1'
}
```
或
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ android {

dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
api rootProject.ext.support["appcompat-v7"]
testCompile 'junit:junit:4.12'
api 'com.android.support.constraint:constraint-layout:1.0.0-beta2'
//下拉刷新,上拉加载
api rootProject.ext.dependencies.tkrefreshlayout
api project(':mvvmhabit')
// api 'com.github.goldze:MVVMHabit:1.2.5.3'
// api 'com.github.goldze:MVVMHabit:1.2.6.1'
}
25 changes: 15 additions & 10 deletions config.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
ext {
//android开发版本配置
android = [
compileSdkVersion: 26,
buildToolsVersion: "26.0.2",
compileSdkVersion: 27,
buildToolsVersion: "27.0.2",
applicationId : "com.goldze.mvvmhabit",
minSdkVersion : 15,
targetSdkVersion : 26,
targetSdkVersion : 27,
versionCode : 1,
versionName : "1.0",
]
//support配置
support = [
"constraint-layout": "1.0.0-beta2",
'appcompat-v7' :'com.android.support:appcompat-v7:${version["appcompat-v7"]}',
'junit' : 'junit:junit:${version["junit"]}',
'support-v4' : 'com.android.support:support-v4:${version["support-version"]}',
'appcompat-v7' : 'com.android.support:appcompat-v7:${version["support-version"]}',
'recyclerview-v7' : 'com.android.support:recyclerview-v7:${version["support-version"]}',
'support-v13' : 'com.android.support:support-v13:${version["support-version"]}',
'support-fragment' : 'com.android.support:support-fragment:${version["support-version"]}',
'animated-vector-drawable' : 'com.android.support:animated-vector-drawable:${version["support-version"]}',
'junit' : 'junit:junit:${version["junit-version"]}',
]
//version配置
version = [
"appcompat-v7" : "26.1.0",
"junit" : "4.12",
"support-version": "27.0.2",
"junit-version" : "4.12",
]
//依赖第三方配置
dependencies = [
Expand All @@ -27,7 +32,7 @@ ext {
"rxandroid" : "io.reactivex:rxandroid:1.2.1",
//rx管理View的生命周期
"rxlifecycle" : "com.trello:rxlifecycle:1.0",
"rxlifecycle-components" : "com.trello:rxlifecycle-components:1.0",
"rxlifecycle-components" : "com.trello:rxlifecycle-components:1.0",
//rxbinding
"rxbinding" : "com.jakewharton.rxbinding:rxbinding:1.0.1",
//rx 6.0权限请求
Expand All @@ -39,7 +44,7 @@ ext {
"adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:2.3.0",
//glide图片加载
"glide" : "com.github.bumptech.glide:glide:4.4.0",
"glide-compiler" : "com.github.bumptech.glide:compiler:4.4.0",
"glide-compiler" : "com.github.bumptech.glide:compiler:4.4.0",
//json解析
"gson" : "com.google.code.gson:gson:2.8.1",
//material-dialogs
Expand All @@ -50,7 +55,7 @@ ext {
//recyclerview的databinding套装
"bindingcollectionadapter" : "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter:2.2.0",
"bindingcollectionadapter-recyclerview": "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter-recyclerview:2.2.0",
"lifecycle-extensions": "android.arch.lifecycle:extensions:1.0.0",
"lifecycle-extensions" : "android.arch.lifecycle:extensions:1.0.0",
]
}

Expand Down
44 changes: 33 additions & 11 deletions mvvmhabit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,35 @@ android {
dependencies {
//rx管理View的生命周期
api fileTree(include: ['*.jar'], dir: 'libs')
api rootProject.ext.support["appcompat-v7"]

// api rootProject.ext.support["support-v4"]
// api rootProject.ext.support["appcompat-v7"]
// api rootProject.ext.support["support-v13"]
// api rootProject.ext.support["recyclerview-v7"]
// api rootProject.ext.support["support-fragment"]
// api rootProject.ext.support["animated-vector-drawable"]


api 'com.android.support:support-v4:' + rootProject.ext.version["support-version"]
api 'com.android.support:appcompat-v7:' + rootProject.ext.version["support-version"]
api 'com.android.support:support-v13:' + rootProject.ext.version["support-version"]
api 'com.android.support:recyclerview-v7:' + rootProject.ext.version["support-version"]
api 'com.android.support:support-fragment:' + rootProject.ext.version["support-version"]
api 'com.android.support:animated-vector-drawable:' + rootProject.ext.version["support-version"]
testCompile 'junit:junit:4.12'
//rxjava
api rootProject.ext.dependencies.rxjava
api rootProject.ext.dependencies.rxandroid
api rootProject.ext.dependencies.rxlifecycle
api rootProject.ext.dependencies["rxlifecycle-components"]
api (rootProject.ext.dependencies.rxlifecycle){
exclude group: 'com.android.support'
}
api (rootProject.ext.dependencies["rxlifecycle-components"]){
exclude group: 'com.android.support'
}
//rxbinding
api rootProject.ext.dependencies.rxbinding
api (rootProject.ext.dependencies.rxbinding){
exclude group: 'com.android.support'
}
//rx权限请求
api rootProject.ext.dependencies.rxpermissions
//network
Expand All @@ -41,16 +61,18 @@ dependencies {
//json解析
api rootProject.ext.dependencies.gson
//material-dialogs
api rootProject.ext.dependencies.core
api rootProject.ext.dependencies.commons
api (rootProject.ext.dependencies.core)
api (rootProject.ext.dependencies.commons)
//glide图片加载库
implementation (rootProject.ext.dependencies.glide){
exclude group: 'com.android.support'
}
implementation (rootProject.ext.dependencies.glide)
annotationProcessor (rootProject.ext.dependencies["glide-compiler"])
//recyclerview的databinding套装
api rootProject.ext.dependencies.bindingcollectionadapter
api rootProject.ext.dependencies["bindingcollectionadapter-recyclerview"]
api (rootProject.ext.dependencies.bindingcollectionadapter){
exclude group: 'com.android.support'
}
api (rootProject.ext.dependencies["bindingcollectionadapter-recyclerview"]){
exclude group: 'com.android.support'
}
//Google LiveData和ViewModel组件
//api rootProject.ext.dependencies["lifecycle-extensions"]
}

0 comments on commit 8216c6f

Please sign in to comment.