Skip to content

Commit

Permalink
Released version 3.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Conor O'Donnell committed Nov 7, 2016
1 parent e1f1d36 commit 05e23cb
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 48 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## Version 3.0.11

07-11-2016
* Removed dependency on Rebound
* Updated Android Support Library to 25.0.0
* Updated Play Services and Firebase to 9.8.0
* Performance improvements

## Version 3.0.10

05-10-2016
Expand Down Expand Up @@ -101,7 +109,7 @@ Where is 2.x? We're skipping it. We did this to align the Android SDK with our i

How GCM is set up has been simplified. There is not longer a method `Intercom.client().setupGcm(token)` and `Intercom.client().registerIdentifiedUser(Registration.create().withGcmRegistrationId(token));`

Instead of the mehtods above, in your res/values/strings.xml add the following line replacing YOUR_SENDER_ID. The sender is is in your google-services.json file as "project_number": "YOUR_SENDER_ID"
Instead of the methods above, in your res/values/strings.xml add the following line replacing YOUR_SENDER_ID. The sender is is in your google-services.json file as "project_number": "YOUR_SENDER_ID"

`<string name="intercom_gcm_sender_id">YOUR_SENDER_ID</string>`

Expand Down
59 changes: 29 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,50 +88,49 @@ Here is our complete dependency graph:
### intercom-sdk-base
```
# Transitive (shared with your app)
+--- com.android.support:design:24.2.0
+--- com.android.support:appcompat-v7:24.2.0
+--- com.android.support:animated-vector-drawable:24.2.0
+--- com.android.support:support-vector-drawable:24.2.0
+--- com.android.support:support-v4:24.2.0
+--- com.android.support:support-annotations:24.2.0
+--- com.android.support:recyclerview-v7:24.2.0
+--- com.android.support:design:25.0.0
+--- com.android.support:appcompat-v7:25.0.0
+--- com.android.support:animated-vector-drawable:25.0.0
+--- com.android.support:support-vector-drawable:25.0.0
+--- com.android.support:support-v4:25.0.0
+--- com.android.support:support-annotations:25.0.0
+--- com.android.support:recyclerview-v7:25.0.0
# Repackaged (not shared with your app)
+--- com.facebook.rebound:rebound:0.3.8
+--- com.squareup:otto:1.3.8
+--- com.github.bumptech.glide:glide-intercom:3.7.0 # Modified version of Glide
+--- com.squareup.okio:okio:1.9.0
+--- com.squareup.okhttp3:okhttp:3.4.1
+--- com.squareup.okhttp3:okhttp-ws:3.4.1
+--- com.squareup.okio:okio:1.11.0
+--- com.squareup.okhttp3:okhttp:3.4.2
+--- com.squareup.okhttp3:okhttp-ws:3.4.2
+--- com.squareup.retrofit2:retrofit:2.1.0
+--- com.squareup.retrofit2:converter-gson:2.1.0
+--- com.google.code.gson:gson:2.7
+--- com.google.code.gson:gson:2.8.0
```

If you use some of the repackaged libraries in your app, you may want to use a build that depends on them transitively. A guide to using this build can be found [here](https://docs.intercom.com/configure-intercom-for-your-product-or-site/configure-intercom-for-mobile/using-transitive-dependencies-with-intercom-for-android). Using this build involves more work as you need to make sure your app uses the correct version of each library.

### intercom-sdk-gcm
```
+--- com.google.android.gms:play-services-base:9.4.0
| +--- com.google.android.gms:play-services-basement:9.4.0
| | \--- com.android.support:support-v4:23.0.0 -> 24.2.0 (*)
| \--- com.google.android.gms:play-services-tasks:9.4.0
| \--- com.google.android.gms:play-services-basement:9.4.0 (*)
+--- com.google.android.gms:play-services-basement:9.4.0 (*)
\--- com.google.android.gms:play-services-iid:9.4.0
+--- com.google.android.gms:play-services-base:9.4.0 (*)
\--- com.google.android.gms:play-services-basement:9.4.0 (*)
+--- com.google.android.gms:play-services-base:9.8.0
| +--- com.google.android.gms:play-services-basement:9.8.0
| | \--- com.android.support:support-v4:23.0.0 -> 25.0.0 (*)
| \--- com.google.android.gms:play-services-tasks:9.8.0
| \--- com.google.android.gms:play-services-basement:9.8.0 (*)
+--- com.google.android.gms:play-services-basement:9.8.0 (*)
\--- com.google.android.gms:play-services-iid:9.8.0
+--- com.google.android.gms:play-services-base:9.8.0 (*)
\--- com.google.android.gms:play-services-basement:9.8.0 (*)
```

### intercom-sdk-fcm
```
+--- com.google.android.gms:play-services-basement:9.4.0
| \--- com.android.support:support-v4:23.0.0 -> 24.2.0 (*)
+--- com.google.firebase:firebase-iid:9.4.0
| +--- com.google.android.gms:play-services-basement:9.4.0 (*)
| \--- com.google.firebase:firebase-common:9.4.0
| +--- com.google.android.gms:play-services-basement:9.4.0 (*)
| \--- com.google.android.gms:play-services-tasks:9.4.0
| \--- com.google.android.gms:play-services-basement:9.4.0 (*)
\--- com.google.firebase:firebase-common:9.4.0 (*)
+--- com.google.android.gms:play-services-basement:9.8.0
| \--- com.android.support:support-v4:23.0.0 -> 25.0.0 (*)
+--- com.google.firebase:firebase-iid:9.8.0
| +--- com.google.android.gms:play-services-basement:9.8.0 (*)
| \--- com.google.firebase:firebase-common:9.8.0
| +--- com.google.android.gms:play-services-basement:9.8.0 (*)
| \--- com.google.android.gms:play-services-tasks:9.8.0
| \--- com.google.android.gms:play-services-basement:9.8.0 (*)
\--- com.google.firebase:firebase-common:9.8.0 (*)
```
Binary file removed aar/intercom-sdk-base/intercom-sdk-base-3.0.10.aar
Binary file not shown.
Binary file not shown.
Binary file removed aar/intercom-sdk-fcm/intercom-sdk-fcm-3.0.10.aar
Binary file not shown.
Binary file added aar/intercom-sdk-fcm/intercom-sdk-fcm-3.0.11.aar
Binary file not shown.
Binary file removed aar/intercom-sdk-gcm/intercom-sdk-gcm-3.0.10.aar
Binary file not shown.
Binary file added aar/intercom-sdk-gcm/intercom-sdk-gcm-3.0.11.aar
Binary file not shown.
10 changes: 2 additions & 8 deletions samples/intercom-sample-fcm/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "io.intercom.sample"
Expand All @@ -19,16 +19,10 @@ android {
}
}

repositories {
maven {
url 'https://dl.bintray.com/intercom/intercom-maven'
}
}

dependencies {
compile 'io.intercom.android:intercom-sdk-base:3.+'
compile 'io.intercom.android:intercom-sdk-fcm:3.+'
compile 'com.google.firebase:firebase-messaging:9.4.0'
compile 'com.google.firebase:firebase-messaging:9.8.0'
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion samples/intercom-sample-fcm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.google.gms:google-services:3.0.0'
}
}
Expand Down
8 changes: 1 addition & 7 deletions samples/intercom-sample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.1"
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "io.intercom.sample"
Expand All @@ -19,12 +19,6 @@ android {
}
}

repositories {
maven {
url 'https://dl.bintray.com/intercom/intercom-maven'
}
}

dependencies {
compile 'io.intercom.android:intercom-sdk:3.+'
}
2 changes: 1 addition & 1 deletion samples/intercom-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

Expand Down

0 comments on commit 05e23cb

Please sign in to comment.