Merge pull request #113 from JoshLipan/dev

Dev

Author: JoshLipan

.gitignore

@@ -92,4 +92,6 @@ build-res/
 *.qshell
 example/node_modules/*
 example/npm-debug*
+/**/bin/
+.vscode/
 

android/src/io/jchat/android/utils/ResultUtils.java

@@ -9,9 +9,6 @@
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.google.gson.jpush.JsonElement;
-import com.google.gson.jpush.JsonObject;
-import com.google.gson.jpush.JsonParser;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -21,6 +18,9 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.jmessage.support.google.gson.JsonElement;
+import cn.jmessage.support.google.gson.JsonObject;
+import cn.jmessage.support.google.gson.JsonParser;
 import cn.jpush.im.android.api.JMessageClient;
 import cn.jpush.im.android.api.content.CustomContent;
 import cn.jpush.im.android.api.content.EventNotificationContent;

example/android/app/app.iml

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {
@@ -18,7 +18,7 @@
     "url": "https://github.com/jpush/jmessage-react-plugin/issues"
   },
   "peerDependencies": {
-    "jcore-react-native": ">= 1.2.10"
+    "jcore-react-native": ">= 1.2.11"
   },
   "rnpm": {
     "ios": {
@@ -43,6 +43,6 @@
   },
   "homepage": "https://github.com/jpush/jmessage-react-plugin#readme",
   "dependencies": {
-    "jcore-react-native": "^1.2.10"
+    "jcore-react-native": "^1.2.11"
   }
 }