Merge pull request #81 from intercom/dalecantwell/update-versions

Update ios to 3.0.11 and android to 3.0.7
intercom · Sep 9, 2016 · c3387a0 · c3387a0
2 parents 7bbbd90 + ccc329c
commit c3387a0
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Intercom for Cordova/PhoneGap
 
+## 3.0.10 (2016-09-09)
+
+* Updated Intercom for Android to [3.0.7](https://github.com/intercom/intercom-android/releases/tag/3.0.7).
+* Updated Intercom for iOS to [3.0.11](https://github.com/intercom/intercom-ios/releases/tag/3.0.11).
+
 ## 3.0.9 (2016-08-29)
 
 * Updated Intercom for Android to [3.0.4](https://github.com/intercom/intercom-android/releases/tag/3.0.4).

diff --git a/README.md b/README.md
@@ -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`:
 
-    <plugin name="cordova-plugin-intercom" version="~3.0.9" />
+    <plugin name="cordova-plugin-intercom" version="~3.0.10" />
 
 ## Configuring Intercom
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-intercom",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "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.9" 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.10" 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/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.9");
+            CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.10");
 
             switch (IntercomPushManager.getInstalledModuleType()) {
                 case GCM: {

diff --git a/src/android/intercom.gradle b/src/android/intercom.gradle
@@ -4,5 +4,5 @@ repositories {
   }
 }
 dependencies {
-    compile 'io.intercom.android:intercom-sdk:3.0.4'
+    compile 'io.intercom.android:intercom-sdk:3.0.7'
 }
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.10
+//  Intercom for iOS - Version 3.0.11
 //
 //  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.10) of Intercom for iOS supports iOS 8.0 upwards.
+#error This version (3.0.11) 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/Intercom.framework/Versions/A/Resources/Intercom.bundle/locales/fi.strings b/src/ios/Intercom.framework/Versions/A/Resources/Intercom.bundle/locales/fi.strings
@@ -1,30 +1,30 @@
-"error.loading.conversation" = "Keskustelun lataus epдonnistui";
+"error.loading.conversation" = "Keskustelun lataus epäonnistui";
 "actionsheet.message.failed.delivery" = "Viestin toimitus ei onnistunut";
 "message.delivered" = "Toimitettu";
 "alert.new.sdk.user.button" = "Kiitos";
 "profile.time.location.format" = "{time} – {location}";
-"message.state.sending" = "Lдhetetддn";
+"message.state.sending" = "Lähetetään";
 "message.placeholder.write.reply" = "Kirjoita vastaus";
-"twitter.follow.us" = "Seuraa meitд Twitterissд";
-"alert.new.sdk.user.message" = "iOS-sovellus on nyt integroitu Intercom-kдyttцympдristцn kanssa";
+"twitter.follow.us" = "Seuraa meitä Twitterissä";
+"alert.new.sdk.user.message" = "iOS-sovellus on nyt integroitu Intercom-käyttöympäristön kanssa";
 "error.title" = "Jokin meni vikaan";
-"error.no_conversations.message.no_app_name" = "Keskusteluja ei vielд ole";
-"facebook.like.us" = "Tykkдд meistд Facebookissa";
+"error.no_conversations.message.no_app_name" = "Keskusteluja ei vielä ole";
+"facebook.like.us" = "Tykkää meistä Facebookissa";
 "from.app" = "– {name}";
-"error.loading.conversations.fallback" = "Keskusteluja tдmдn tiimin kanssa ei voitu ladata: {name}";
+"error.loading.conversations.fallback" = "Keskusteluja tämän tiimin kanssa ei voitu ladata: {name}";
 "message.placeholder.start.conversation" = "Aloita keskustelu";
 "navigation.back" = "Takaisin";
 "admin.from.app" = "{name} – {company}";
-"message.not.seen" = "Ei vielд nдhty";
+"message.not.seen" = "Ei vielä nähty";
 "error.no_conversations.title" = "Ei keskusteluja";
 "time.difference.delivered" = "Toimitettu";
-"actionsheet.try.again" = "Yritд uudelleen";
+"actionsheet.try.again" = "Yritä uudelleen";
 "alert.new.sdk.user.title" = "Onnittelut";
 "app_team" = "{name}-tiimi";
 "navbar.title.conversations" = "Keskustelut – {name}";
 "actionsheet.cancel" = "Peruuta";
 "navigation.close" = "Sulje";
-"message.send" = "Lдhetд";
+"message.send" = "Lähetä";
 "time.difference.format.hours.ago" = "{delta} h sitten";
 "time.difference.format.weeks.ago" = "{delta} vkoa sitten";
 "last_active.format.hours.ago" = "Aktiivinen {hours} h sitten";
@@ -34,15 +34,15 @@
 "time.difference.just.now" = "Juuri nyt";
 "last_active.minutes.ago" = "Aktiivinen {minutes} m sitten";
 "last_active.15_minutes" = "Aktiivinen edellisen {minutes} m aikana";
-"message.seen" = "Nдhty";
+"message.seen" = "Nähty";
 "last_active.format.days.ago" = "Aktiivinen {days} pv sitten";
 "error.starting.conversation.fallback" = "Aloita uusi keskustelu";
-"error.no_conversations.message" = "Ei vielд keskusteluja tдmдn tiimin kanssa: {name}";
+"error.no_conversations.message" = "Ei vielä keskusteluja tämän tiimin kanssa: {name}";
 "time.difference.format.days.ago" = "{delta} pv sitten";
-"error.loading.conversations.fallback.no_app_name" = "Keskustelujen lataus epдonnistui";
-"we.run.on.intercom" = "Toimimme Intercom-kдyttцympдristцssд";
+"error.loading.conversations.fallback.no_app_name" = "Keskustelujen lataus epäonnistui";
+"we.run.on.intercom" = "Toimimme Intercom-käyttöympäristössä";
 "navbar.title.conversations.no_app_name" = "Keskustelut";
 "time.difference.format.minutes.ago" = "{delta} m sitten";
-"error.tap.to.retry" = "Yritд uudelleen";
+"error.tap.to.retry" = "Yritä uudelleen";
 "reply_from_admin" = "Vastaus {name}";
-"inbox.you" = "Sinд";
+"inbox.you" = "Sinä";
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.9"];
+    [Intercom setCordovaVersion:@"3.0.10"];
     #ifdef DEBUG
         [Intercom enableLogging];
     #endif