upgrade to v3.0.2

jeasonlzy · Jun 29, 2017 · 3ff6327 · 3ff6327
1 parent e9a8096
commit 3ff6327
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -35,45 +35,49 @@
 
 ## 使用
 
+[![](https://img.shields.io/badge/API-14%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=14) [![](https://img.shields.io/badge/platform-android-brightgreen.svg)](https://developer.android.com/index.html) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5b244560c35c445cbb00b9500b0c5d2a)](https://www.codacy.com/app/jeasonlzy/okhttp-OkGo?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=jeasonlzy/okhttp-OkGo&amp;utm_campaign=Badge_Grade)  [![](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/jeasonlzy/okhttp-OkGo/blob/master/LICENSE)  [![](https://img.shields.io/badge/%E4%BD%9C%E8%80%85-jeasonlzy-orange.svg)](https://github.com/jeasonlzy)
+
+[![](https://img.shields.io/badge/OkGo-v3.0.2-brightgreen.svg)](https://github.com/jeasonlzy/okhttp-OkGo) [![](https://img.shields.io/badge/OkRx-v1.0.2-brightgreen.svg)](https://github.com/jeasonlzy/okhttp-OkGo) [![](https://img.shields.io/badge/OkRx2-v2.0.2-brightgreen.svg)](https://github.com/jeasonlzy/okhttp-OkGo) [![](https://img.shields.io/badge/OkServer-v2.0.2-brightgreen.svg)](https://github.com/jeasonlzy/okhttp-OkGo)
+
 Android Studio用户
 
 > 一般来说，只需要添加第一个okgo的核心包即可，其余的三个库根据自己的需要选择添加！！！
 
 ```java
 //必须使用
-compile 'com.lzy.net:okgo:3.0.1'
+compile 'com.lzy.net:okgo:3.0.2'
 
 //以下三个选择添加，okrx和okrx2不能同时使用
-compile 'com.lzy.net:okrx:1.0.1'
-compile 'com.lzy.net:okrx2:2.0.1'  
-compile 'com.lzy.net:okserver:2.0.1'
+compile 'com.lzy.net:okrx:1.0.2'
+compile 'com.lzy.net:okrx2:2.0.2'  
+compile 'com.lzy.net:okserver:2.0.2'
 ```
 
 Eclipse的用户(赶紧换AS吧)，可以选择添加本项目根目录中 `/jar` 目录下的jar包:
 
 > 一般来说，至少需要okhttp、okio、okgo三个jar包，其余的三个扩展jar包根据自己的需要选择添加！！！
 
 必须使用
-> [okhttp-3.8.0.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okhttp-3.8.0.jar)  
+> [okhttp-3.8.1.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okhttp-3.8.1.jar)  
 [okio-1.13.0.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okio-1.13.0.jar)   
-[okgo-3.0.1.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okgo-3.0.1.jar)   
+[okgo-3.0.2.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okgo-3.0.2.jar)   
 
 以下三个选择添加，okrx和okrx2不能同时使用
-> [okrx-1.0.1.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okrx-1.0.1.jar)  
-[okrx2-2.0.1.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okrx2-2.0.1.jar)   
-[okserver-2.0.1.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okserver-2.0.1.jar)  
+> [okrx-1.0.2.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okrx-1.0.2.jar)  
+[okrx2-2.0.2.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okrx2-2.0.2.jar)   
+[okserver-2.0.2.jar](https://raw.githubusercontent.com/jeasonlzy/okhttp-OkGo/master/jar/okserver-2.0.2.jar)  
 
 ## 文档
 ### 该项目的文档全部以Wiki的形式展示，重要的事情说三遍
 - [Wiki文档首页请猛戳这里](https://github.com/jeasonlzy/okhttp-OkGo/wiki)
 - [Wiki文档首页请猛戳这里](https://github.com/jeasonlzy/okhttp-OkGo/wiki)
 - [Wiki文档首页请猛戳这里](https://github.com/jeasonlzy/okhttp-OkGo/wiki)
 
-如果你不想编译项目，提供了apk供直接运行，方便查看效果，[点击下载okgo_v3.0.1.apk](http://7xss53.com1.z0.glb.clouddn.com/file/okgo_v3.0.1.apk)
+如果你不想编译项目，提供了apk供直接运行，方便查看效果，点击图标下载：[![](https://img.shields.io/badge/downloads-okgo__v3.0.2.apk-blue.svg)](http://7xss53.com1.z0.glb.clouddn.com/file/okgo_v3.0.2.apk)
 
 本项目Demo使用的是我自己的服务器，有时候可能不稳定，网速比较慢时请耐心等待，尴尬呀。。
 
-如果你想查看历史版本信息，[请点击历史版本](https://github.com/jeasonlzy/okhttp-OkGo/releases)。
+如果你想查看历史版本信息，请点击图标：[![](https://img.shields.io/badge/release-tags-ff69b4.svg)](https://github.com/jeasonlzy/okhttp-OkGo/releases)
 
 如果你使用遇到了问题，首先请看控制台log，如果log无法看出问题，无法确定是该库的bug还是服务端的问题，建议抓包查看网络数据，[详细的抓包方法猛戳这里](https://github.com/jeasonlzy/okhttp-OkGo/wiki#网络抓包)
 

diff --git a/build.gradle b/build.gradle
@@ -25,11 +25,11 @@ task clean(type: Delete) {
 }
 
 ext {
-    versionCode = 24
-    versionName_okgo = '3.0.1'
-    versionName_okserver = '2.0.1'
-    versionName_okrx = '1.0.1'
-    versionName_okrx2 = '2.0.1'
+    versionCode = 26
+    versionName_okgo = '3.0.2'
+    versionName_okserver = '2.0.2'
+    versionName_okrx = '1.0.2'
+    versionName_okrx2 = '2.0.2'
 
     libMinSdkVersion = 14
     appMinSdkVersion = 16

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -47,6 +47,15 @@ android {
     lintOptions {
         abortOnError false
     }
+    packagingOptions {
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/notice'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/license'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/rxjava.properties'
+    }
 }
 
 task makeApk {
@@ -63,7 +72,6 @@ task makeApk {
     }
 }
 
-
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile "com.android.support:appcompat-v7:$supportVersion"
@@ -80,13 +88,13 @@ dependencies {
     compile 'com.readystatesoftware.chuck:library:1.0.4'
 
     compile project(':okgo')
-//  compile project(':okrx')
+    compile project(':okrx')
     compile project(':okrx2')
     compile project(':okserver')
-//  compile 'com.lzy.net:okgo:3.0.0'
-//  compile 'com.lzy.net:okrx:1.0.0'
-//  compile 'com.lzy.net:okrx2:2.0.0'
-//  compile 'com.lzy.net:okserver:2.0.0'
+//  compile 'com.lzy.net:okgo:3.0.2'
+//  compile 'com.lzy.net:okrx:1.0.2'
+//  compile 'com.lzy.net:okrx2:2.0.2'
+//  compile 'com.lzy.net:okserver:2.0.2'
     compile 'com.lzy.widget:ninegridview:0.2.1'
     compile 'com.lzy.widget:imagepicker:0.3.2'
     compile 'com.lzy.widget:view-core:0.2.1'

diff --git a/jar/okgo-3.0.1.jar → jar/okgo-3.0.2.jar b/jar/okgo-3.0.1.jar → jar/okgo-3.0.2.jar
diff --git a/jar/okhttp-3.8.0.jar b/jar/okhttp-3.8.0.jar
diff --git a/jar/okhttp-3.8.1.jar b/jar/okhttp-3.8.1.jar
diff --git a/jar/okrx-1.0.1.jar → jar/okrx-1.0.2.jar b/jar/okrx-1.0.1.jar → jar/okrx-1.0.2.jar
diff --git a/jar/okrx2-2.0.1.jar → jar/okrx2-2.0.2.jar b/jar/okrx2-2.0.1.jar → jar/okrx2-2.0.2.jar
diff --git a/jar/okserver-2.0.1.jar b/jar/okserver-2.0.1.jar
diff --git a/jar/okserver-2.0.2.jar b/jar/okserver-2.0.2.jar
diff --git a/okgo/build.gradle b/okgo/build.gradle
@@ -14,7 +14,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.squareup.okhttp3:okhttp:3.8.0'
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
 }
 
 //apply from: 'bintray.gradle'
diff --git a/okrx2/build.gradle b/okrx2/build.gradle
@@ -14,7 +14,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+    compile 'io.reactivex.rxjava2:rxjava:2.1.1'
 //    compile "com.lzy.net:okgo:$versionName_okgo"
     compile project(':okgo')
 }