Skip to content

Commit 1715e6d

Browse files
committed
Merge remote-tracking branch 'CONFIDENTIAL/version-3.0.0-dev' into dev
# Conflicts: # constants.gradle
2 parents 29145b2 + a0e68e3 commit 1715e6d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
compile "com.google.firebase:firebase-database:$firebaseVersion"
4646
compile "com.google.firebase:firebase-storage:$firebaseVersion"
4747

48-
compile('com.facebook.android:facebook-android-sdk:4.25.0')
48+
compile('com.facebook.android:facebook-login:4.27.0')
4949
compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
5050

5151
compile "android.arch.lifecycle:runtime:$architectureVersion"
@@ -57,12 +57,12 @@ dependencies {
5757
// The following dependencies are not required to use the Firebase UI library.
5858
// They are used to make some aspects of the demo app implementation simpler for
5959
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
60-
compile 'pub.devrel:easypermissions:0.4.3'
60+
compile 'pub.devrel:easypermissions:1.0.1'
6161
compile 'com.jakewharton:butterknife:8.7.0'
6262
annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
63-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
64-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
65-
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
63+
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
64+
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
65+
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
6666
}
6767

6868
apply plugin: 'com.google.gms.google-services'

auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
compile "com.google.firebase:firebase-auth:$firebaseVersion"
5252
compile "com.google.android.gms:play-services-auth:$firebaseVersion"
5353

54-
provided 'com.facebook.android:facebook-android-sdk:4.25.0'
54+
provided 'com.facebook.android:facebook-login:4.27.0'
5555
provided("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
5656

5757
// The following libraries are needed to prevent incompatibilities with the facebook
@@ -62,7 +62,7 @@ dependencies {
6262
//noinspection GradleDynamicVersion
6363
testCompile 'org.mockito:mockito-core:2.8.+'
6464
testCompile 'org.robolectric:robolectric:3.4'
65-
testCompile 'com.facebook.android:facebook-android-sdk:4.25.0'
65+
testCompile 'com.facebook.android:facebook-login:4.27.0'
6666
}
6767

6868
javadoc.exclude([

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import com.facebook.FacebookCallback;
2929
import com.facebook.FacebookException;
3030
import com.facebook.FacebookRequestError;
31-
import com.facebook.FacebookSdk;
3231
import com.facebook.GraphRequest;
3332
import com.facebook.GraphResponse;
33+
import com.facebook.WebDialog;
3434
import com.facebook.login.LoginManager;
3535
import com.facebook.login.LoginResult;
3636
import com.firebase.ui.auth.AuthUI;
@@ -64,7 +64,7 @@ public FacebookProvider(AuthUI.IdpConfig idpConfig, @StyleRes int theme) {
6464
} else {
6565
mScopes = scopes;
6666
}
67-
FacebookSdk.setWebDialogTheme(theme);
67+
WebDialog.setWebDialogTheme(theme);
6868
}
6969

7070
public static AuthCredential createAuthCredential(IdpResponse response) {

constants.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ project.ext {
1111
buildTools = '26.0.1' // Remember to also update in .travis.yml
1212

1313
firebaseVersion = '11.4.2'
14-
supportLibraryVersion = '26.0.1'
14+
supportLibraryVersion = '26.1.0'
1515
architectureVersion = '1.0.0-alpha8'
1616
}

0 commit comments

Comments
 (0)