Skip to content

Commit

Permalink
Merge pull request #118 from intercom/conor/bump-android
Browse files Browse the repository at this point in the history
Update Android to 3.0.12 and bump version
  • Loading branch information
ronocod authored Nov 10, 2016
2 parents 2ea292b + e15ab76 commit 87700fc
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Intercom for Cordova/PhoneGap

## 3.0.17 (2016-11-10)

* Updated Intercom for Android to [3.0.12](https://github.com/intercom/intercom-android/releases/tag/3.0.12).
* Added NSPhotoLibraryUsageDescription to Info.plist for iOS

## 3.0.16 (2016-11-07)

* Updated Intercom for Android to [3.0.11](https://github.com/intercom/intercom-android/releases/tag/3.0.11).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cordova plugin add cordova-plugin-intercom

To add the plugin to your PhoneGap app, add the following to your `config.xml`:
```xml
<plugin name="cordova-plugin-intercom" version="~3.0.16" />
<plugin name="cordova-plugin-intercom" version="~3.0.17" />
```
## Example App

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": "cordova-plugin-intercom",
"version": "3.0.16",
"version": "3.0.17",
"description": "Official Cordova/PhoneGap plugin for Intercom",
"cordova": {
"id": "cordova-plugin-intercom",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<plugin id="cordova-plugin-intercom" version="3.0.16" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<plugin id="cordova-plugin-intercom" version="3.0.17" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>Intercom</name>
<author>Intercom</author>
<license>MIT License</license>
Expand Down
2 changes: 1 addition & 1 deletion src/android/IntercomBridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void setUpIntercom() {
try {
Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();

CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.16");
CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.17");

switch (IntercomPushManager.getInstalledModuleType()) {
case GCM: {
Expand Down
2 changes: 1 addition & 1 deletion src/android/intercom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ repositories {
}

dependencies {
compile 'io.intercom.android:intercom-sdk:3.0.11'
compile 'io.intercom.android:intercom-sdk:3.0.12'
}
2 changes: 1 addition & 1 deletion src/ios/IntercomBridge.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ + (void)setCordovaVersion:(NSString *)v;
@implementation IntercomBridge : CDVPlugin

- (void)pluginInitialize {
[Intercom setCordovaVersion:@"3.0.16"];
[Intercom setCordovaVersion:@"3.0.17"];
#ifdef DEBUG
[Intercom enableLogging];
#endif
Expand Down

0 comments on commit 87700fc

Please sign in to comment.