From 2b730fb5f92dc22cc09df618972f0835b48a375d Mon Sep 17 00:00:00 2001 From: Grantland Chew Date: Wed, 2 Dec 2015 11:48:08 -0800 Subject: [PATCH 1/2] Update parse-android to 1.11.0 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 0bbc8fc..0e86430 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -18,7 +18,7 @@ android { } dependencies { - compile 'com.parse:parse-android:1.10.2' + compile 'com.parse:parse-android:1.11.0' compile 'com.facebook.android:facebook-android-sdk:3.21.0' } From aab230458318d1b1fa122c74fe7aeeff1acf0050 Mon Sep 17 00:00:00 2001 From: Grantland Chew Date: Mon, 7 Dec 2015 16:50:17 -0800 Subject: [PATCH 2/2] Gradle workaround to support the split of bolts-android --- library/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 0e86430..91e590b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -20,7 +20,13 @@ android { dependencies { compile 'com.parse:parse-android:1.11.0' - compile 'com.facebook.android:facebook-android-sdk:3.21.0' + // We need to exclude bolts-android since facebook-android-sdk 3.x.x depends on a version of + // bolts-android before being split into bolts-tasks and bolts-applinks. + compile ('com.facebook.android:facebook-android-sdk:3.23.1') { + exclude module: 'bolts-android' + } + // facebook-android-sdk 3.x.x depends on AppLinks inside bolts-android + compile 'com.parse.bolts:bolts-applinks:1.3.0' } android.libraryVariants.all { variant ->