Merge branch 'dev'

jpush · Sep 26, 2017 · ba1ad50 · ba1ad50
2 parents e35314e + 7e311cf
commit ba1ad50
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+\.DS_Store
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Cordova Plugin JCore
 
-[![release](https://img.shields.io/badge/release-1.1.8-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-1.1.9-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-jcore",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "jcore for cordova plugin",
   "cordova": {
     "id": "cordova-plugin-jcore",

diff --git a/plugin.xml b/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="cordova-plugin-jcore"
-     version="1.1.8">
+     version="1.1.9">
 
     <name>JCore</name>
     <description>Cordova plugin for jcore</description>
@@ -15,15 +15,15 @@
     </engines>
 
     <platform name="android">
-        <source-file src="src/android/arm64-v8a/libjcore116.so" target-dir="libs/arm64-v8a"/>
-        <source-file src="src/android/armeabi/libjcore116.so" target-dir="libs/armeabi"/>
-        <source-file src="src/android/armeabi-v7a/libjcore116.so" target-dir="libs/armeabi-v7a"/>
-        <source-file src="src/android/mips/libjcore116.so" target-dir="libs/mips"/>
-        <source-file src="src/android/mips64/libjcore116.so" target-dir="libs/mips64"/>
-        <source-file src="src/android/x86/libjcore116.so" target-dir="libs/x86"/>
-        <source-file src="src/android/x86_64/libjcore116.so" target-dir="libs/x86_64"/>
+        <source-file src="src/android/arm64-v8a/libjcore117.so" target-dir="libs/arm64-v8a"/>
+        <source-file src="src/android/armeabi/libjcore117.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjcore117.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/mips/libjcore117.so" target-dir="libs/mips"/>
+        <source-file src="src/android/mips64/libjcore117.so" target-dir="libs/mips64"/>
+        <source-file src="src/android/x86/libjcore117.so" target-dir="libs/x86"/>
+        <source-file src="src/android/x86_64/libjcore117.so" target-dir="libs/x86_64"/>
 
-        <source-file src="src/android/jcore-android-1.1.6.jar" target-dir="libs"/>
+        <source-file src="src/android/jcore-android-1.1.7.jar" target-dir="libs"/>
     </platform>
 
     <platform name="ios">

diff --git a/src/android/arm64-v8a/libjcore116.so → src/android/arm64-v8a/libjcore117.so b/src/android/arm64-v8a/libjcore116.so → src/android/arm64-v8a/libjcore117.so
diff --git a/src/android/armeabi-v7a/libjcore116.so → src/android/armeabi-v7a/libjcore117.so b/src/android/armeabi-v7a/libjcore116.so → src/android/armeabi-v7a/libjcore117.so
diff --git a/src/android/armeabi/libjcore116.so → src/android/armeabi/libjcore117.so b/src/android/armeabi/libjcore116.so → src/android/armeabi/libjcore117.so
diff --git a/src/android/jcore-android-1.1.6.jar b/src/android/jcore-android-1.1.6.jar
diff --git a/src/android/jcore-android-1.1.7.jar b/src/android/jcore-android-1.1.7.jar
diff --git a/src/android/mips/libjcore116.so → src/android/mips/libjcore117.so b/src/android/mips/libjcore116.so → src/android/mips/libjcore117.so
diff --git a/src/android/mips64/libjcore116.so → src/android/mips64/libjcore117.so b/src/android/mips64/libjcore116.so → src/android/mips64/libjcore117.so
diff --git a/src/android/x86/libjcore116.so → src/android/x86/libjcore117.so b/src/android/x86/libjcore116.so → src/android/x86/libjcore117.so
diff --git a/src/android/x86_64/libjcore116.so → src/android/x86_64/libjcore117.so b/src/android/x86_64/libjcore116.so → src/android/x86_64/libjcore117.so