Merge pull request #114 from intercom/conor/bump

Update to latest Messenger versions on iOS and Android
intercom · Nov 7, 2016 · 6b29494 · 6b29494
2 parents 929071c + 612540c
commit 6b29494
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Intercom for Cordova/PhoneGap
 
+## 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).
+* Updated Intercom for iOS to [3.0.18](https://github.com/intercom/intercom-ios/releases/tag/3.0.18).
+
 ## 3.0.15 (2016-10-19)
 
 * Updated Intercom for iOS to [3.0.17](https://github.com/intercom/intercom-ios/releases/tag/3.0.17).

diff --git a/README.md b/README.md
@@ -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.15" />
+<plugin name="cordova-plugin-intercom" version="~3.0.16" />
 ```
 ## Example App
 

diff --git a/circle.yml b/circle.yml
@@ -11,7 +11,7 @@ dependencies:
   override:
     - npm install -g cordova
     - if [ ! -e $ANDROID_HOME/platforms/android-24 ]; then echo y | android update sdk --no-ui --all --filter android-24; fi
-    - if [ ! -e $ANDROID_HOME/extras/android/m2repository/com/android/support/design/24.2.1 ]; then echo y | android update sdk --no-ui --all --filter extra-android-m2repository; fi
+    - if [ ! -e $ANDROID_HOME/extras/android/m2repository/com/android/support/design/25.0.0 ]; then echo y | android update sdk --no-ui --all --filter extra-android-m2repository; fi
     - if [ ! -e $ANDROID_HOME/extras/google/m2repository/com/google/firebase/firebase-messaging/9.8.0 ]; then echo y | android update sdk --no-ui --all --filter extra-google-m2repository; fi
 
   cache_directories:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-intercom",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "description": "Official Cordova/PhoneGap plugin for Intercom",
   "cordova": {
     "id": "cordova-plugin-intercom",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-intercom" version="3.0.15" 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.16" 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>

diff --git a/src/android/CordovaHeaderInterceptor.java b/src/android/CordovaHeaderInterceptor.java
@@ -1,4 +1,5 @@
 package io.intercom.android.sdk.api;
+
 import android.content.Context;
 
 public class CordovaHeaderInterceptor {

diff --git a/src/android/IntercomBridge.java b/src/android/IntercomBridge.java
@@ -62,7 +62,7 @@ private void setUpIntercom() {
         try {
             Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();
 
-            CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.15");
+            CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.16");
 
             switch (IntercomPushManager.getInstalledModuleType()) {
                 case GCM: {

diff --git a/src/android/build-extras-intercom.gradle b/src/android/build-extras-intercom.gradle
@@ -4,4 +4,4 @@
 // 
 // @link https://issues.apache.org/jira/browse/CB-10014
 def manifest = new XmlSlurper().parse(file("AndroidManifest.xml"))
-android.defaultConfig.applicationId manifest.@package.text()
+android.defaultConfig.applicationId manifest.@package.text()
diff --git a/src/android/intercom.gradle b/src/android/intercom.gradle
@@ -1,8 +1,7 @@
 repositories {
-  maven {
-    url 'https://dl.bintray.com/intercom/intercom-maven'
-  }
+    jcenter()
 }
+
 dependencies {
-    compile 'io.intercom.android:intercom-sdk:3.0.10'
-}
+    compile 'io.intercom.android:intercom-sdk:3.0.11'
+}
diff --git a/src/ios/Intercom.framework/Versions/A/Headers/Intercom.h b/src/ios/Intercom.framework/Versions/A/Headers/Intercom.h
@@ -1,6 +1,6 @@
 //
 //  Intercom.h
-//  Intercom for iOS - Version 3.0.17
+//  Intercom for iOS - Version 3.0.18
 //
 //  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_8_0
-#error This version (3.0.17) of Intercom for iOS supports iOS 8.0 upwards.
+#error This version (3.0.18) of Intercom for iOS supports iOS 8.0 upwards.
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/src/ios/Intercom.framework/Versions/A/Intercom b/src/ios/Intercom.framework/Versions/A/Intercom
diff --git a/src/ios/IntercomBridge.m b/src/ios/IntercomBridge.m
@@ -9,7 +9,7 @@ + (void)setCordovaVersion:(NSString *)v;
 @implementation IntercomBridge : CDVPlugin
 
 - (void)pluginInitialize {
-    [Intercom setCordovaVersion:@"3.0.15"];
+    [Intercom setCordovaVersion:@"3.0.16"];
     #ifdef DEBUG
         [Intercom enableLogging];
     #endif