Skip to content

Commit

Permalink
1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jtreanor committed Dec 23, 2015
1 parent 03be213 commit e3b1df3
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 13 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

## 1.1.3 (2015-10-08)

* Updated Intercom for iOS to [2.3.18](https://github.com/intercom/intercom-ios/releases/tag/2.3.18).
* Updated Intercom for Android to [1.1.+](https://github.com/intercom/intercom-android/releases/).

## 1.1.2 (2015-10-08)

* Updated Intercom for iOS to [2.3.11](https://github.com/intercom/intercom-ios/releases/tag/2.3.11).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To install the plugin in your Cordova app, run the following:

To add the plugin to your PhoneGap app, add the following to your `config.xml`:

<gap:plugin name="cordova-plugin-intercom" version="1.1.2" source="npm" />
<gap:plugin name="cordova-plugin-intercom" version="1.1.3" source="npm" />

## Configuring Intercom

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": "1.1.2",
"version": "1.1.3",
"description": "Cordova plugin for Intercom for mobile",
"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="1.1.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<plugin id="cordova-plugin-intercom" version="1.1.3" 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
7 changes: 5 additions & 2 deletions src/android/IntercomBridge.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.intercom.android.sdk;

import io.intercom.android.sdk.api.Api;

import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CordovaInterface;
Expand Down Expand Up @@ -29,6 +31,7 @@ public class IntercomBridge extends CordovaPlugin {

@Override protected void pluginInitialize() {
this.setUpIntercom();
Bridge.getApi().ping();
}

@Override public void onStart() {
Expand All @@ -50,7 +53,7 @@ private void setUpIntercom() {
try {
Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();

HeaderInterceptor.setCordovaVersion(context, "1.1.2");
HeaderInterceptor.setCordovaVersion(context, "1.1.3");

ApplicationInfo app = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
Bundle bundle = app.metaData;
Expand Down Expand Up @@ -169,7 +172,7 @@ private enum Action {
},
openGCMMessage {
@Override void performAction(JSONArray args, CallbackContext callbackContext, CordovaInterface cordova) {
Intercom.client().openGCMMessage(cordova.getActivity().getIntent().getData());
Intercom.client().openGCMMessage(cordova.getActivity().getIntent());
callbackContext.success();
}
},
Expand Down
8 changes: 3 additions & 5 deletions src/android/intercom.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
repositories {
maven {
url 'https://dl.bintray.com/intercom/intercom-maven'
}
jcenter()
}
dependencies {
compile ('io.intercom.android:intercom-sdk-base:1.1.7')
compile ('io.intercom.android:intercom-sdk-gcm:1.1.7') {
compile ('io.intercom.android:intercom-sdk-base:1.1.+')
compile ('io.intercom.android:intercom-sdk-gcm:1.1.+') {
transitive = false
}
}
Binary file removed src/ios/Intercom.bundle/certs/digicert-root.icmcer
Binary file not shown.
Binary file removed src/ios/Intercom.bundle/certs/digicert.icmcer
Binary file not shown.
Binary file modified src/ios/Intercom.bundle/certs/intercom.icmcer
Binary file not shown.
4 changes: 2 additions & 2 deletions src/ios/Intercom.framework/Versions/A/Headers/Intercom.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Intercom.h
// Intercom for iOS - Version 2.3.11
// Intercom for iOS - Version 2.3.18
//
// Created by Intercom on 8/01/2015.
// Copyright (c) 2014 Intercom. All rights reserved.
Expand All @@ -10,7 +10,7 @@
#import <UIKit/UIKit.h>

#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
#error This version (2.3.11) of Intercom for iOS supports iOS 7.0 upwards.
#error This version (2.3.18) of Intercom for iOS supports iOS 7.0 upwards.
#endif

NS_ASSUME_NONNULL_BEGIN
Expand Down
Binary file modified src/ios/Intercom.framework/Versions/A/Intercom
Binary file not shown.
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:@"1.1.2"];
[Intercom setCordovaVersion:@"1.1.3"];
#ifdef DEBUG
[Intercom enableLogging];
#endif
Expand Down

0 comments on commit e3b1df3

Please sign in to comment.