Merge branch 'dev'

jpush · Apr 10, 2020 · a4f0dc1 · a4f0dc1
2 parents 8ee21de + 9901364
commit a4f0dc1
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,11 @@
 - Android: v1.2.1
 - iOS: v1.1.6
 
+**v1.3.2** 对应的 jcore 版本：
+
+- Android: v2.3.2
+- iOS: v2.2.4
+
 注意：从 v1.2.0 版本开始支持 cordova-android 7.0.0。
 
 ## 什么是 JCore

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-jcore",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "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.3.1">
+     version="1.3.2">
 
     <name>JCore</name>
     <description>Cordova plugin for jcore</description>
@@ -15,18 +15,18 @@
     </engines>
 
     <platform name="android">
-        <resource-file src="src/android/arm64-v8a/libjcore216.so" target="jniLibs/arm64-v8a/libjcore216.so"/>
-        <resource-file src="src/android/armeabi/libjcore216.so" target="jniLibs/armeabi/libjcore216.so"/>
-        <resource-file src="src/android/armeabi-v7a/libjcore216.so" target="jniLibs/armeabi-v7a/libjcore216.so"/>
-        <resource-file src="src/android/mips/libjcore216.so" target="jniLibs/mips/libjcore216.so"/>
-        <resource-file src="src/android/mips64/libjcore216.so" target="jniLibs/mips64/libjcore216.so"/>
-        <resource-file src="src/android/x86/libjcore216.so" target="jniLibs/x86/libjcore216.so"/>
-        <resource-file src="src/android/x86_64/libjcore216.so" target="jniLibs/x86_64/libjcore216.so"/>
+        <resource-file src="src/android/arm64-v8a/libjcore232.so" target="jniLibs/arm64-v8a/libjcore232.so"/>
+        <resource-file src="src/android/armeabi/libjcore232.so" target="jniLibs/armeabi/libjcore232.so"/>
+        <resource-file src="src/android/armeabi-v7a/libjcore232.so" target="jniLibs/armeabi-v7a/libjcore232.so"/>
+        <resource-file src="src/android/mips/libjcore232.so" target="jniLibs/mips/libjcore232.so"/>
+        <resource-file src="src/android/mips64/libjcore232.so" target="jniLibs/mips64/libjcore232.so"/>
+        <resource-file src="src/android/x86/libjcore232.so" target="jniLibs/x86/libjcore232.so"/>
+        <resource-file src="src/android/x86_64/libjcore232.so" target="jniLibs/x86_64/libjcore232.so"/>
 
-        <lib-file src="src/android/jcore-android-2.1.6.jar" />
+        <lib-file src="src/android/jcore-android-2.3.2.jar" />
     </platform>
 
     <platform name="ios">
-        <source-file src="src/ios/jcore-ios-2.1.4.a" framework="true" />
+        <source-file src="src/ios/jcore-ios-2.2.4.a" framework="true" />
     </platform>
 </plugin>
diff --git a/src/android/arm64-v8a/libjcore216.so → src/android/arm64-v8a/libjcore232.so b/src/android/arm64-v8a/libjcore216.so → src/android/arm64-v8a/libjcore232.so
diff --git a/src/android/armeabi-v7a/libjcore216.so → src/android/armeabi-v7a/libjcore232.so b/src/android/armeabi-v7a/libjcore216.so → src/android/armeabi-v7a/libjcore232.so
diff --git a/src/android/armeabi/libjcore216.so → src/android/armeabi/libjcore232.so b/src/android/armeabi/libjcore216.so → src/android/armeabi/libjcore232.so
diff --git a/src/android/jcore-android-2.1.6.jar b/src/android/jcore-android-2.1.6.jar
diff --git a/src/android/jcore-android-2.3.2.jar b/src/android/jcore-android-2.3.2.jar
diff --git a/src/android/mips/libjcore216.so → src/android/mips/libjcore232.so b/src/android/mips/libjcore216.so → src/android/mips/libjcore232.so
diff --git a/src/android/mips64/libjcore216.so → src/android/mips64/libjcore232.so b/src/android/mips64/libjcore216.so → src/android/mips64/libjcore232.so
diff --git a/src/android/x86/libjcore216.so → src/android/x86/libjcore232.so b/src/android/x86/libjcore216.so → src/android/x86/libjcore232.so
diff --git a/src/android/x86_64/libjcore216.so → src/android/x86_64/libjcore232.so b/src/android/x86_64/libjcore216.so → src/android/x86_64/libjcore232.so
diff --git a/src/ios/jcore-ios-2.1.4.a → src/ios/jcore-ios-2.2.4.a b/src/ios/jcore-ios-2.1.4.a → src/ios/jcore-ios-2.2.4.a