1.1.1

CHANGES → CHANGELOG.md

@@ -1,41 +1,49 @@
-= 1.1.0 (2015-09-21)
+# Intercom for Cordova/PhoneGap
+
+## 1.1.1 (2015-10-01)
+
+* Updated Intercom for iOS to [2.3.10](https://github.com/intercom/intercom-ios/releases/tag/2.3.10).
+* Updated Intercom for Android to [1.1.7](https://github.com/intercom/intercom-android/blob/master/CHANGELOG.md).
+* Improved handling of Android dependencies to reduce `Multiple dex files` errors.
+
+## 1.1.0 (2015-09-21)
 
 * Updated Intercom for iOS to [2.3.5](https://github.com/intercom/intercom-ios/releases/tag/2.3.5).
 * Updated Intercom for Android to [1.1.4](https://github.com/intercom/intercom-android/blob/master/CHANGELOG.md).
-* App ID and API keys are now configuratble in your `config.xml` (fixes https://github.com/intercom/intercom-cordova/issues/1).
+* App ID and API keys are now configurable in your `config.xml` (fixes https://github.com/intercom/intercom-cordova/issues/1).
 
-= 1.0.9 (2015-09-11)
+## 1.0.9 (2015-09-11)
 
 * Updated Intercom for iOS to [2.3.4](https://github.com/intercom/intercom-ios/releases/tag/2.3.4).
 * Fixed https://github.com/intercom/intercom-cordova/issues/20.
 
-= 1.0.8 (2015-08-18)
+## 1.0.8 (2015-08-18)
 
 * Updated Intercom for iOS to [2.3.3](https://github.com/intercom/intercom-ios/releases/tag/2.3.3).
 
-= 1.0.7 (2015-08-05)
+## 1.0.7 (2015-08-05)
 
 * Updated Intercom for iOS to [2.3.2](https://github.com/intercom/intercom-ios/releases/tag/2.3.2).
 
-= 1.0.6 (2015-07-28)
+## 1.0.6 (2015-07-28)
 
 * Updated Intercom for Android to [1.1.3](https://github.com/intercom/intercom-android/blob/master/CHANGELOG.md).
 
-= 1.0.5 (2015-07-20)
+## 1.0.5 (2015-07-20)
 
 * Updated Intercom for iOS to [2.3.1](https://github.com/intercom/intercom-ios/blob/master/CHANGES) and updated Intercom for Android to [1.1.2](https://github.com/intercom/intercom-android/blob/master/CHANGELOG.md).
 * The plugin is now available through npm.
 
-= 1.0.2 (2015-07-01)
+## 1.0.2 (2015-07-01)
 
 * Updated Intercom for iOS to [2.3.0](https://github.com/intercom/intercom-ios/blob/master/CHANGES) and updated Intercom for Android to [1.1.1](https://github.com/intercom/intercom-android/blob/master/CHANGELOG.md).
 * Fixed https://github.com/intercom/intercom-cordova/issues/5 and https://github.com/intercom/intercom-cordova/issues/7
 
-= 1.0.1 (2015-06-05)
+## 1.0.1 (2015-06-05)
 
 * Improved push notification handling by introducing much simpler `intercom.registerForPush(senderId)`.
 * Updated Intercom for iOS to 2.2.4 and updated Intercom for Android to 1.0.3.
 
-= 1.0.0 (2015-05-25)
+## 1.0.0 (2015-05-25)
 
 * Initial release of the Intercom plugin for Cordova and PhoneGap.

README.md

@@ -14,13 +14,25 @@ To install the plugin in your Cordova app, run the following:
 
     cordova plugin add cordova-plugin-intercom
 
-### PhoneGap CLI
+### PhoneGap
 
 To add the plugin to your PhoneGap app, add the following to your `config.xml`:
 
-    <gap:plugin name="cordova-plugin-intercom" version="1.1.0" source="npm" />
+    <gap:plugin name="cordova-plugin-intercom" version="1.1.1" source="npm" />
 
-**Note:** Unfortunately, [PhoneGap build](https://build.phonegap.com) does not currently support [gradle builds](http://community.phonegap.com/nitobi/topics/phonegap-build-does-not-support-gradle-builds). This means on Android, our plugin only supports PhoneGap CLI or Cordova builds at this time.
+## Troubleshooting
+
+### Android Dex errors
+
+Some users experience Android build errors similar to the following:
+
+```
+UNEXPECTED TOP-LEVEL EXCEPTION:
+    com.android.dex.DexException: Multiple dex files define Landroid/support/annotation/AnimRes;
+    ...
+```
+
+If you are seeing errors like these it means that another plugin you are using is including Google Play Services or the Android Support library in an outdated way (usually by copying a jar). We recommend you suggest to the plugin vendor that they require this via a `<framework>` tag or Gradle instead.
 
 ## Configuring Intercom
 
@@ -179,9 +191,9 @@ Intercom for mobile supports Push Notifications on iOS and Google Cloud Messagin
 
 To enable iOS push notifications, simply call `intercom.registerForPush()`.
 
-To enable Android push notifications, call `intercom.registerForPush('sender_id')`.
+To enable Android push notifications, call `intercom.registerForPush('sender_id')`. Where `sender_id` is your [Sender ID](https://developers.google.com/cloud-messaging/gcm#senderid) from the Google Developer Console.
 
-**Note:** _If you use PushPlugin to support non Intercom push notifications in addition to Intercom's notifications, you must use our fork which is available [here](https://github.com/intercom/PushPlugin). Install it with: `cordova plugin add https://github.com/intercom/PushPlugin.git`. We know this is not ideal but unfortunately it is necessary due to the inflexible nature of PushPlugin._
+**Note:** _If you use [phonegap-plugin-push](https://github.com/phonegap/phonegap-plugin-push) to support non Intercom push notifications in addition to Intercom's notifications, you must use our fork which is available [here](https://github.com/intercom/phonegap-plugin-push). Install it with: `cordova plugin add https://github.com/intercom/phonegap-plugin-push.git`. We know this is not ideal but unfortunately it is necessary due to the inflexible nature of PushPlugin._
 
 ## More information
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-intercom",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Cordova plugin for Intercom for mobile",
   "cordova": {
     "id": "cordova-plugin-intercom",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-intercom" version="1.1.0" 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.1" 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>
@@ -54,6 +54,7 @@
       <source-file src="src/android/IntercomBridge.java" target-dir="src/io/intercom/android/sdk" />
       <source-file src="src/android/IntercomGCMManager.java" target-dir="src/io/intercom/android/sdk" />
       <framework src="src/android/intercom.gradle" custom="true" type="gradleReference" />
+      <framework src="com.google.android.gms:play-services-gcm:8.1.0" /> 
 
       <config-file target="config.xml" parent="*/">
         <feature name="Intercom">

src/android/IntercomBridge.java

@@ -50,7 +50,7 @@ private void setUpIntercom() {
                 try {
                     Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();
 
-                    HeaderInterceptor.setCordovaVersion(context, "1.1.0");
+                    HeaderInterceptor.setCordovaVersion(context, "1.1.1");
 
                     ApplicationInfo app = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
                     Bundle bundle = app.metaData;

src/android/intercom.gradle

@@ -4,7 +4,8 @@ repositories {
     }
 }
 dependencies {
-    compile ('io.intercom.android:intercom-sdk:1.1.4@aar') { 
-        transitive = true
+    compile ('io.intercom.android:intercom-sdk-base:1.1.7')
+    compile ('io.intercom.android:intercom-sdk-gcm:1.1.7') {
+        transitive = false
     }
 }

src/ios/Intercom.framework/Versions/A/Headers/Intercom.h

@@ -1,6 +1,6 @@
 //
 //  Intercom.h
-//  Intercom for iOS - Version 2.3.5
+//  Intercom for iOS - Version 2.3.10
 //
 //  Created by Intercom on 8/01/2015.
 //  Copyright (c) 2014 Intercom. All rights reserved.
@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
-#error This version (2.3.5) of Intercom for iOS supports iOS 7.0 upwards.
+#error This version (2.3.10) of Intercom for iOS supports iOS 7.0 upwards.
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

src/ios/IntercomBridge.m

@@ -9,7 +9,7 @@ + (void)setCordovaVersion:(NSString *)v;
 @implementation IntercomBridge : CDVPlugin
 
 - (void)pluginInitialize {
-    [Intercom setCordovaVersion:@"1.1.0"];
+    [Intercom setCordovaVersion:@"1.1.1"];
     #ifdef DEBUG
         [Intercom enableLogging];
     #endif