Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,24 @@ android {


dependencies {
compile "com.android.support:design:${project.ext.support_library_version}"
compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"

compile 'com.facebook.android:facebook-android-sdk:4.17.0'
compile("com.twitter.sdk.android:twitter:2.1.1@aar") { transitive = true }

// The following libraries are needed to prevent incompatibilities with the facebook
// library when updating com.android.support libraries:
compile "com.android.support:customtabs:${project.ext.support_library_version}"
compile "com.android.support:cardview-v7:${project.ext.support_library_version}"


testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.2.0'
testCompile 'org.mockito:mockito-core:2.2.2'
testCompile 'org.robolectric:robolectric:3.1.2'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

compile 'com.facebook.android:facebook-android-sdk:4.14.1'
compile("com.twitter.sdk.android:twitter:2.0.0@aar") {
transitive = true;
}
compile "com.android.support:design:${project.ext.support_library_version}"

compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"
}

checkstyle {
Expand Down
3 changes: 3 additions & 0 deletions auth/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
android:name="io.fabric.ApiKey"
android:value="@string/twitter_consumer_secret"/>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes broken twitter auth and huge 3.4mb leak because twitter has terrible error handling.


<activity
android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity"
Expand Down
4 changes: 1 addition & 3 deletions common/constants.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
project.ext.firebase_version = '9.8.0'
// use caution when updating support library version, v25.0.0 caused issues
// with the Facebook SDK. (NoSuchMethodError startActivity)
project.ext.support_library_version = '24.2.1'
project.ext.support_library_version = '25.0.1'

project.ext.submodules = ['database', 'auth', 'storage']
project.ext.group = 'com.firebaseui'
Expand Down