Update dependencies and set FUI version (#1070)

SUPERCILEX · samtstern · commit f3169b1a8c04 · 2017-12-22T10:00:19.000-08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -45,19 +45,19 @@ dependencies {
     implementation project(path: ':database')
     implementation project(path: ':storage')
 
-    implementation 'com.facebook.android:facebook-login:4.28.0'
+    implementation 'com.facebook.android:facebook-login:4.29.0'
     // Needed to override Facebook
     implementation "com.android.support:cardview-v7:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
     implementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
-    implementation 'com.github.bumptech.glide:glide:4.3.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
+    implementation 'com.github.bumptech.glide:glide:4.4.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
 
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    implementation 'pub.devrel:easypermissions:1.0.1'
+    implementation 'pub.devrel:easypermissions:1.1.1'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
diff --git a/app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java b/app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java
@@ -155,19 +155,19 @@ private void showDownloadUI() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String[] permissions,
-                                           int[] grantResults) {
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
 
     @Override
-    public void onPermissionsGranted(int requestCode, List<String> perms) {
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
         // See #choosePhoto with @AfterPermissionGranted
     }
 
     @Override
-    public void onPermissionsDenied(int requestCode, List<String> perms) {
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
         if (EasyPermissions.somePermissionPermanentlyDenied(this,
                                                             Collections.singletonList(PERMS))) {
             new AppSettingsDialog.Builder(this).build().show();
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
 
         vectorDrawables.useSupportLibrary = true
         resourcePrefix "fui_"
@@ -36,7 +36,7 @@ android {
 dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
 
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
@@ -52,9 +52,9 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
     //noinspection GradleDynamicVersion
-    testImplementation 'org.mockito:mockito-core:2.12.+'
-    testImplementation 'org.robolectric:robolectric:3.5.1'
-    testImplementation 'com.facebook.android:facebook-login:4.28.0'
+    testImplementation 'org.mockito:mockito-core:2.13.+'
+    testImplementation 'org.robolectric:robolectric:3.6.1'
+    testImplementation 'com.facebook.android:facebook-login:4.29.0'
     testImplementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
     lintChecks project(':lint')
diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -184,6 +184,20 @@ public static AuthUI getInstance() {
      */
     @NonNull
     public static AuthUI getInstance(@NonNull FirebaseApp app) {
+        AuthUI authUi;
+        synchronized (INSTANCES) {
+            authUi = INSTANCES.get(app);
+            if (authUi == null) {
+                authUi = new AuthUI(app);
+                authUi.mAuth.setFirebaseUIVersion(BuildConfig.VERSION_NAME);
+                INSTANCES.put(app, authUi);
+            }
+        }
+        return authUi;
+    }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    static AuthUI getTestInstance(FirebaseApp app) {
         AuthUI authUi;
         synchronized (INSTANCES) {
             authUi = INSTANCES.get(app);
diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -46,7 +46,7 @@ public void setUp() {
     @Test
     public void testCreateStartIntent_shouldHaveEmailAsDefaultProvider() {
         FlowParameters flowParameters = AuthUI
-                .getInstance(mFirebaseApp)
+                .getTestInstance(mFirebaseApp)
                 .createSignInIntentBuilder()
                 .build()
                 .getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS);
@@ -57,15 +57,16 @@ public void testCreateStartIntent_shouldHaveEmailAsDefaultProvider() {
     @Test(expected = IllegalArgumentException.class)
     public void testCreateStartIntent_shouldOnlyAllowOneInstanceOfAnIdp() {
         SignInIntentBuilder startIntent =
-                AuthUI.getInstance(mFirebaseApp).createSignInIntentBuilder();
+                AuthUI.getTestInstance(mFirebaseApp).createSignInIntentBuilder();
         startIntent.setAvailableProviders(
                 Arrays.asList(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build(),
                               new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build()));
     }
 
     @Test
     public void testCreatingStartIntent() {
-        FlowParameters flowParameters = AuthUI.getInstance(mFirebaseApp).createSignInIntentBuilder()
+        FlowParameters flowParameters = AuthUI.getTestInstance(mFirebaseApp)
+                .createSignInIntentBuilder()
                 .setAvailableProviders(
                         Arrays.asList(new IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build(),
                                       new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build(),
diff --git a/common/build.gradle b/common/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion minSdk
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
     }
 }
 
diff --git a/constants.gradle b/constants.gradle
@@ -8,7 +8,7 @@ project.ext {
     targetSdk = 27
     minSdk = 14
 
-    firebaseVersion = '11.6.2'
+    firebaseVersion = '11.8.0'
     supportLibraryVersion = '27.0.2'
     architectureVersion = '1.0.0'
 }
diff --git a/database/build.gradle b/database/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion minSdk
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 }
diff --git a/firestore/build.gradle b/firestore/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion minSdk
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "0.0.0"
+        versionName version
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
         vectorDrawables.useSupportLibrary = true
diff --git a/storage/build.gradle b/storage/build.gradle
@@ -8,12 +8,14 @@ android {
         minSdkVersion minSdk
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
     }
 }
 
 dependencies {
-    api 'com.github.bumptech.glide:glide:4.3.1'
+    api 'com.github.bumptech.glide:glide:4.4.0'
 
     api "com.google.firebase:firebase-storage:$firebaseVersion"
+    // Override Play Services
+    implementation "com.android.support:support-v4:$supportLibraryVersion"
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ android {`
`8`	`8`	`minSdkVersion minSdk`
`9`	`9`	`targetSdkVersion targetSdk`
`10`	`10`	`versionCode 1`
`11`		`- versionName "1.0"`
	`11`	`+ versionName version`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ project.ext {`
`8`	`8`	`targetSdk = 27`
`9`	`9`	`minSdk = 14`
`10`	`10`
`11`		`- firebaseVersion = '11.6.2'`
	`11`	`+ firebaseVersion = '11.8.0'`
`12`	`12`	`supportLibraryVersion = '27.0.2'`
`13`	`13`	`architectureVersion = '1.0.0'`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ android {`
`9`	`9`	`minSdkVersion minSdk`
`10`	`10`	`targetSdkVersion targetSdk`
`11`	`11`	`versionCode 1`
`12`		`- versionName "1.0"`
	`12`	`+ versionName version`
`13`	`13`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`14`	`14`	`}`
`15`	`15`	`}`