release v2.1.0

ThirtyDegreesRay · Dec 7, 2017 · 2111373 · 2111373
1 parent 9a3df9d
commit 2111373
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 7 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -4,7 +4,6 @@
 [![Releases](https://img.shields.io/github/release/ThirtyDegreesRay/OpenHub.svg)](https://github.com/ThirtyDegreesRay/OpenHub/releases/latest)
 
 一个**开源**的GitHub Android客户端应，快速简洁。
-<!-- ![OpenHub](https://github.com/ThirtyDegreesRay/OpenHub/raw/master/art/openhub.png) -->
 
 [酷安下载](https://www.coolapk.com/apk/com.thirtydegreesray.openhub)
 
@@ -33,6 +32,7 @@
 * 查看你私有的、公开的、forked和星标的版本库
 * 查看每日、每周和每月的最热版本库
 * 搜索版本库
+* 查看Wiki最近更新
 
 ### 用户
 * 查看用户信息

diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ An **open source** GitHub Android client app, faster and concise.
 * View your private, public, forked and starred repos
 * View trending repos of daily, weekly and monthly
 * Search repos
+* View recent wiki updates
 
 ### Users
 * View user info

diff --git a/app/build.gradle b/app/build.gradle
@@ -109,8 +109,12 @@ dependencies {
     //Type-safe HTTP client for Android and Java by Square, Inc.
     compile "com.squareup.retrofit2:retrofit:${RETROFIT_VERSION}"
     compile "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
-    compile "com.squareup.retrofit2:converter-simplexml:${RETROFIT_VERSION}"
     compile "com.squareup.retrofit2:adapter-rxjava:${RETROFIT_VERSION}"
+    compile ("com.squareup.retrofit2:converter-simplexml:${RETROFIT_VERSION}"){
+        exclude group: 'xpp3', module: 'xpp3'
+        exclude group: 'stax', module: 'stax-api'
+        exclude group: 'stax', module: 'stax'
+    }
 
     //dagger依赖注入
     compile "com.google.dagger:dagger:${DAGGER_VERSION}"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -100,4 +100,6 @@ public static java.lang.String TABLENAME;
 -keep class com.google.gson.stream.** { *; }
 -keepattributes EnclosingMethod
 -keep class com.thirtydegreesray.openhub.mvp.model.**{*;}
--keep class com.thirtydegreesray.openhub.dao.**{*;}
+-keep class com.thirtydegreesray.openhub.dao.**{*;}
+# SimpleXml
+-keep class org.simpleframework.xml.core.**{ *; }
diff --git a/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/WikiPresenter.java b/app/src/main/java/com/thirtydegreesray/openhub/mvp/presenter/WikiPresenter.java
@@ -11,10 +11,11 @@
 import com.thirtydegreesray.openhub.mvp.model.WikiModel;
 import com.thirtydegreesray.openhub.mvp.presenter.base.BasePresenter;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.util.ArrayList;
 
 import javax.inject.Inject;
-import javax.xml.stream.XMLStreamException;
 
 /**
  * Created by ThirtyDegreesRay on 2017/12/6 16:41:32
@@ -45,7 +46,7 @@ public void loadWiki(boolean isReload) {
             @Override
             public void onError(Throwable error) {
                 mView.hideLoading();
-                if(error.getCause() !=null && error.getCause() instanceof XMLStreamException){
+                if(error.getCause() != null && error.getCause() instanceof XmlPullParserException){
                     mView.showWiki(null);
                 } else {
                     mView.showLoadError(getErrorTip(error));

diff --git a/art/drawer.png b/art/drawer.png
diff --git a/art/profile.png b/art/profile.png
diff --git a/art/repo.png b/art/repo.png
diff --git a/gradle.properties b/gradle.properties
@@ -27,8 +27,8 @@ BUILD_TOOLS_VERSION = 26.0.2
 MIN_SDK_VERSION = 21
 TARGET_SDK_VERSION = 26
 
-VERSION_CODE = 18
-VERSION_NAME = 2.0.0
+VERSION_CODE = 19
+VERSION_NAME = 2.1.0
 
 #library
 #ANDROID_SUPPORT_VERSION = 26.1.0