Skip to content

Commit 079e9b6

Browse files
authored
Merge pull request #396 from SUPERCILEX/update-facebook-supportlib
[URGENT] Fix NoSuchMethodException and fix broken twitter auth
2 parents 14c1e62 + 629077d commit 079e9b6

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

auth/build.gradle

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,24 @@ android {
3131

3232

3333
dependencies {
34+
compile "com.android.support:design:${project.ext.support_library_version}"
35+
compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
36+
compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"
37+
38+
compile 'com.facebook.android:facebook-android-sdk:4.17.0'
39+
compile("com.twitter.sdk.android:twitter:2.1.1@aar") { transitive = true }
40+
41+
// The following libraries are needed to prevent incompatibilities with the facebook
42+
// library when updating com.android.support libraries:
43+
compile "com.android.support:customtabs:${project.ext.support_library_version}"
44+
compile "com.android.support:cardview-v7:${project.ext.support_library_version}"
45+
46+
3447
testCompile 'junit:junit:4.12'
35-
testCompile 'org.mockito:mockito-core:2.2.0'
48+
testCompile 'org.mockito:mockito-core:2.2.2'
3649
testCompile 'org.robolectric:robolectric:3.1.2'
3750
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
3851
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
39-
40-
compile 'com.facebook.android:facebook-android-sdk:4.14.1'
41-
compile("com.twitter.sdk.android:twitter:2.0.0@aar") {
42-
transitive = true;
43-
}
44-
compile "com.android.support:design:${project.ext.support_library_version}"
45-
46-
compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
47-
compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"
4852
}
4953

5054
checkstyle {

auth/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<meta-data
1010
android:name="com.google.android.gms.version"
1111
android:value="@integer/google_play_services_version" />
12+
<meta-data
13+
android:name="io.fabric.ApiKey"
14+
android:value="@string/twitter_consumer_secret"/>
1215

1316
<activity
1417
android:name="com.firebase.ui.auth.ui.email.ConfirmRecoverPasswordActivity"

common/constants.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
project.ext.firebase_version = '9.8.0'
2-
// use caution when updating support library version, v25.0.0 caused issues
3-
// with the Facebook SDK. (NoSuchMethodError startActivity)
4-
project.ext.support_library_version = '24.2.1'
2+
project.ext.support_library_version = '25.0.1'
53

64
project.ext.submodules = ['database', 'auth', 'storage']
75
project.ext.group = 'com.firebaseui'

0 commit comments

Comments
 (0)