update to 3.0.7

goldze · Jan 25, 2019 · 5e5dc4f · 5e5dc4f
1 parent b3d7145
commit 5e5dc4f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
 ## 最新日志
-**v3.0.0：2018年10月8日**
+**v3.0.7：2019年1月25日**
 
-- 全面升级AAC，引入谷歌lifecycle组件；
-- 修改Base基类，满足新一套模式；
+- 优化框架代码，解决已知Bug；
+- 新增ViewPager+Fragment例子；
+- 新增RecycleView多布局例子；
 - 升级第三方依赖库；
-- 修改例子程序；
 - 修改文档说明。
-***
 #### [更多日志](./UpdateLog.md)
+***
 
-**注：[1.x-废弃版（最后版本：1.2.6.1）](https://github.com/goldze/MVVMHabit/tree/1.2.6.1)、[2.x-顺手版（最后版本：2.0.10）](https://github.com/goldze/MVVMHabit/tree/2.0.10)已停止维护，建议使用当前[3.x-健壮版（最后版本：3.0.6）](https://github.com/goldze/MVVMHabit)。**
+**注：[1.x-废弃版（最后版本：1.2.6.1）](https://github.com/goldze/MVVMHabit/tree/1.2.6.1)、[2.x-顺手版（最后版本：2.0.10）](https://github.com/goldze/MVVMHabit/tree/2.0.10)已停止维护，建议使用当前[3.x-健壮版（最后版本：3.0.7）](https://github.com/goldze/MVVMHabit)。**
 
 > **原文地址：** [https://github.com/goldze/MVVMHabit](https://github.com/goldze/MVVMHabit)
 
@@ -49,7 +49,7 @@
 	4. 通用的网络请求异常监听，根据不同的状态码或异常设置相应的message。
 	5. 全局的异常捕获，程序发生异常时不会崩溃，可跳入异常界面重启应用。
 	6. 全局事件回调，提供RxBus、Messenger两种回调方式。
-	7. 全局任意位置一行代码实现文件下载。
+	7. 全局任意位置一行代码实现文件进度下载监听（暂不支持多文件进度监听）。
 
 
 ## 1、准备工作

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
         applicationId rootProject.ext.android.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -28,13 +27,14 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
     //support
     implementation rootProject.ext.support["design"]
     //下拉刷新,上拉加载
     implementation 'com.lcodecorex:tkrefreshlayout:1.0.7'
     //底部tabBar
-    implementation 'me.majiajie:pager-bottom-tab-strip:2.2.5'
+    implementation ('me.majiajie:pager-bottom-tab-strip:2.2.5'){
+        exclude group: 'com.android.support'
+    }
     //MVVMHabit
     implementation project(':mvvmhabit')
 //    implementation rootProject.ext.dependencies.MVVMHabit

diff --git a/app/src/main/java/com/goldze/mvvmhabit/ui/rv_multi/MultiRecycleViewModel.java b/app/src/main/java/com/goldze/mvvmhabit/ui/rv_multi/MultiRecycleViewModel.java
@@ -7,6 +7,7 @@
 
 import com.goldze.mvvmhabit.BR;
 import com.goldze.mvvmhabit.R;
+
 import me.goldze.mvvmhabit.base.MultiItemViewModel;
 
 import me.goldze.mvvmhabit.base.BaseViewModel;

diff --git a/config.gradle b/config.gradle
@@ -29,25 +29,25 @@ ext {
     //依赖第三方配置
     dependencies = [
             //rxjava
-            "rxjava"                               : "io.reactivex.rxjava2:rxjava:2.1.12",
-            "rxandroid"                            : "io.reactivex.rxjava2:rxandroid:2.0.2",
+            "rxjava"                               : "io.reactivex.rxjava2:rxjava:2.2.3",
+            "rxandroid"                            : "io.reactivex.rxjava2:rxandroid:2.1.0",
             //rx系列与View生命周期同步
-            "rxlifecycle"                          : "com.trello.rxlifecycle2:rxlifecycle:2.2.1",
-            "rxlifecycle-components"               : "com.trello.rxlifecycle2:rxlifecycle-components:2.2.1",
+            "rxlifecycle"                          : "com.trello.rxlifecycle2:rxlifecycle:2.2.2",
+            "rxlifecycle-components"               : "com.trello.rxlifecycle2:rxlifecycle-components:2.2.2",
             //rxbinding
             "rxbinding"                            : "com.jakewharton.rxbinding2:rxbinding:2.1.1",
             //rx 6.0权限请求
-            "rxpermissions"                        : "com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar",
+            "rxpermissions"                        : "com.github.tbruyelle:rxpermissions:0.10.2",
             //network
             "okhttp"                               : "com.squareup.okhttp3:okhttp:3.10.0",
             "retrofit"                             : "com.squareup.retrofit2:retrofit:2.4.0",
             "converter-gson"                       : "com.squareup.retrofit2:converter-gson:2.4.0",
             "adapter-rxjava"                       : "com.squareup.retrofit2:adapter-rxjava2:2.4.0",
             //glide图片加载
-            "glide"                                : "com.github.bumptech.glide:glide:4.6.1",
-            "glide-compiler"                       : "com.github.bumptech.glide:compiler:4.6.1",
+            "glide"                                : "com.github.bumptech.glide:glide:4.8.0",
+            "glide-compiler"                       : "com.github.bumptech.glide:compiler:4.8.0",
             //json解析
-            "gson"                                 : "com.google.code.gson:gson:2.8.2",
+            "gson"                                 : "com.google.code.gson:gson:2.8.5",
             //material-dialogs
             "material-dialogs-core"                : "com.afollestad.material-dialogs:core:0.9.4.5",
             "material-dialogs-commons"             : "com.afollestad.material-dialogs:commons:0.9.4.5",

diff --git a/dependencies.txt b/dependencies.txt
diff --git a/mvvmhabit/build.gradle b/mvvmhabit/build.gradle
@@ -21,7 +21,6 @@ android {
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
     //support
     api rootProject.ext.support["support-v4"]
     api rootProject.ext.support["appcompat-v7"]
@@ -30,12 +29,20 @@ dependencies {
     api rootProject.ext.dependencies.rxjava
     api rootProject.ext.dependencies.rxandroid
     //rx管理View的生命周期
-    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
+    api(rootProject.ext.dependencies.rxpermissions) {
+        exclude group: 'com.android.support'
+    }
     //network
     api rootProject.ext.dependencies.okhttp
     api rootProject.ext.dependencies.retrofit
@@ -51,10 +58,14 @@ dependencies {
         exclude group: 'com.android.support'
     }
     //glide图片加载库
-    api rootProject.ext.dependencies.glide
+    api (rootProject.ext.dependencies.glide){
+        exclude group: 'com.android.support'
+    }
     annotationProcessor rootProject.ext.dependencies["glide-compiler"]
     //recyclerview的databinding套装
-    api rootProject.ext.dependencies.bindingcollectionadapter
+    api(rootProject.ext.dependencies.bindingcollectionadapter) {
+        exclude group: 'com.android.support'
+    }
     api(rootProject.ext.dependencies["bindingcollectionadapter-recyclerview"]) {
         exclude group: 'com.android.support'
     }