Skip to content

Commit

Permalink
Merge pull request #307 from intercom/hl/explicit-android-version
Browse files Browse the repository at this point in the history
Explicitly set Android version as 10.1.0
  • Loading branch information
harkin committed Sep 14, 2021
2 parents 2c13392 + e2358f7 commit af81844
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
# Intercom for Cordova/PhoneGap

## 10.1.1 (2021-09-14)
* Include dependencies needed to make the Android version build

## 10.1.0 (2021-08-23)
* The Intercom Cordova plugin has been updated to use the latest version (v10.1.0) of the Intercom iOS and Android SDK
* Updated to cordova-android 10.0.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -45,7 +45,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="~10.1.0" />
<plugin name="cordova-plugin-intercom" version="~10.1.1" />
```

## Example App
Expand Down
2 changes: 1 addition & 1 deletion intercom-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-intercom",
"version": "10.1.0",
"version": "10.1.1",
"description": "Official Cordova/PhoneGap plugin for Intercom",
"cordova": {
"id": "cordova-plugin-intercom",
Expand Down
4 changes: 2 additions & 2 deletions intercom-plugin/plugin.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<plugin id="cordova-plugin-intercom" version="10.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="10.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>
Expand Down Expand Up @@ -62,7 +62,7 @@
<source url="https://cdn.cocoapods.org/"/>
</config>
<pods use-frameworks="true">
<pod name="Intercom" spec="~> 10.1.0" />
<pod name="Intercom" spec="~> 10.1.1" />
</pods>
</podspec>
</platform>
Expand Down
2 changes: 1 addition & 1 deletion intercom-plugin/src/android/IntercomBridge.java
Expand Up @@ -70,7 +70,7 @@ private void setUpIntercom() {
try {
Context context = cordova.getActivity().getApplicationContext();

CordovaHeaderInterceptor.setCordovaVersion(context, "10.1.0");
CordovaHeaderInterceptor.setCordovaVersion(context, "10.1.1");

switch (IntercomPushManager.getInstalledModuleType()) {
case FCM: {
Expand Down
4 changes: 4 additions & 0 deletions intercom-plugin/src/android/intercom.gradle
Expand Up @@ -29,6 +29,10 @@ repositories {

dependencies {
implementation 'io.intercom.android:intercom-sdk-base:10.+'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.intercom:twig:1.3.0'
implementation 'org.jetbrains:annotations:13.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
if (pushType == 'fcm' || pushType == 'fcm-without-build-plugin') {
implementation 'com.google.firebase:firebase-messaging:20.+'
implementation 'io.intercom.android:intercom-sdk-fcm:10.+'
Expand Down
2 changes: 1 addition & 1 deletion intercom-plugin/src/ios/IntercomBridge.m
Expand Up @@ -12,7 +12,7 @@ + (void)setCordovaVersion:(NSString *)v;
@implementation IntercomBridge : CDVPlugin

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

0 comments on commit af81844

Please sign in to comment.