Skip to content

Commit

Permalink
Merge branch 'V3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hevin committed Nov 6, 2017
2 parents dc16b0e + f207644 commit 2d1685f
Show file tree
Hide file tree
Showing 21 changed files with 1,401 additions and 604 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# JMessage PhoneGap / Cordova Plugin

[![release](https://img.shields.io/badge/release-3.0.18-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
[![release](https://img.shields.io/badge/release-3.0.19-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
[![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-green.svg)](https://github.com/jpush/jmessage-phonegap-plugin)
[![Code Triagers Badge](https://www.codetriage.com/jpush/jmessage-phonegap-plugin/badges/users.svg)](https://www.codetriage.com/jpush/jmessage-phonegap-plugin)
[![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jmessage-phonegap-plugin",
"version": "3.0.18",
"version": "3.0.19",
"description": "JMessage Cordova Plugin.",
"cordova": {
"id": "jmessage-phonegap-plugin",
Expand Down
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="jmessage-phonegap-plugin"
version="3.0.18">
version="3.0.19">

<name>JMessage</name>
<description>集成极光 IM 和推送功能</description>
Expand Down Expand Up @@ -161,7 +161,7 @@
<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
</config-file>

<source-file src="src/android/libs/jmessage-android_v2.2.1.jar" target-dir="libs"/>
<source-file src="src/android/libs/jmessage-android_v2.3.0.jar" target-dir="libs"/>
<source-file src="src/android/JMessagePlugin.java" target-dir="src/cn/jiguang/cordova/im"/>
<source-file src="src/android/JMessageUtils.java" target-dir="src/cn/jiguang/cordova/im"/>
<source-file src="src/android/JsonUtils.java" target-dir="src/cn/jiguang/cordova/im"/>
Expand Down
Loading

0 comments on commit 2d1685f

Please sign in to comment.