Merge branch 'dev'

jpush · Oct 13, 2017 · 41457a6 · 41457a6
2 parents ba1ad50 + 69a80ce
commit 41457a6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Cordova Plugin JCore
 
-[![release](https://img.shields.io/badge/release-1.1.9-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-1.1.10-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.9",
+  "version": "1.1.10",
   "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.9">
+     version="1.1.10">
 
     <name>JCore</name>
     <description>Cordova plugin for jcore</description>
@@ -27,6 +27,6 @@
     </platform>
 
     <platform name="ios">
-        <source-file src="src/ios/jcore-ios-1.1.5.a" framework="true" />
+        <source-file src="src/ios/jcore-ios-1.1.6.a" framework="true" />
     </platform>
 </plugin>
diff --git a/src/ios/jcore-ios-1.1.5.a → src/ios/jcore-ios-1.1.6.a b/src/ios/jcore-ios-1.1.5.a → src/ios/jcore-ios-1.1.6.a