Merge branch 'dev'

Author: pikacode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jpush-phonegap-plugin",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "JPush for cordova plugin",
   "cordova": {
     "id": "jpush-phonegap-plugin",
@@ -28,7 +28,8 @@
     }
   ],
   "peerDependencies": {
-    "cordova-plugin-device": ">=1.0.0"
+    "cordova-plugin-device": ">=1.0.0",
+    "cordova-plugin-jcore": "1.1.0"
   },
   "author": "JiGuang",
   "license": "MIT",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="jpush-phonegap-plugin"
-  version="3.0.3">
+  version="3.1.0">
 
     <name>JPush Plugin</name>
     <description>JPush for cordova plugin</description>
@@ -18,6 +18,7 @@
 
     <!-- dependencies -->
     <dependency id="cordova-plugin-device" />
+    <dependency id="cordova-plugin-jcore" />
 
     <js-module src="www/JPushPlugin.js" name="JPushPlugin">
         <clobbers target="JPush" />
@@ -38,7 +39,6 @@
 
         <header-file src="src/ios/lib/JPUSHService.h" />
         <source-file src="src/ios/lib/jpush-ios-3.0.2.a" framework="true" />
-        <source-file src="src/ios/lib/jcore-ios-1.1.1.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
@@ -180,12 +180,6 @@
         </config-file>
 
         <source-file src="src/android/libs/jpush-android_v3.0.1.jar" target-dir="libs" />
-        <source-file src="src/android/libs/jcore-android_v1.1.0.jar" target-dir="libs" />
-        <source-file src="src/android/libs/armeabi/libjcore110.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/libs/armeabi-v7a/libjcore110.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/libs/arm64-v8a/libjcore110.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/libs/x86/libjcore110.so" target-dir="libs/x86" />
-        <source-file src="src/android/libs/x86_64/libjcore110.so" target-dir="libs/x86_64" />
 
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />