Update deps

.travis.yml

@@ -13,7 +13,7 @@ cache:
 android:
   components:
     - tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
     - android-25
     - platform-tools
     - extra-android-m2repository

app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
 apply from: '../library/quality/quality.gradle'
 
 android {
@@ -42,12 +41,12 @@ dependencies {
     // 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.
-    compile 'pub.devrel:easypermissions:0.3.0'
+    compile 'pub.devrel:easypermissions:0.3.1'
     compile 'com.jakewharton:butterknife:8.5.1'
-    apt 'com.jakewharton:butterknife-compiler:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

@@ -111,6 +111,7 @@ private void uploadPhoto(Uri uri) {
                     public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                         //noinspection LogConditional
                         Log.d(TAG, "uploadPhoto:onSuccess:" +
+                                //noinspection VisibleForTests TODO remove once the tools team fixes lint
                                 taskSnapshot.getMetadata().getReference().getPath());
                         Toast.makeText(ImageActivity.this, "Image uploaded",
                                        Toast.LENGTH_SHORT).show();

auth/build.gradle

@@ -44,16 +44,16 @@ dependencies {
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"
 
-    compile 'com.facebook.android:facebook-android-sdk:4.20.0'
-    compile("com.twitter.sdk.android:twitter:2.3.1@aar") { transitive = true }
+    compile 'com.facebook.android:facebook-android-sdk:4.22.1'
+    compile("com.twitter.sdk.android:twitter:2.3.2@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:cardview-v7:$supportLibraryVersion"
 
     testCompile 'junit:junit:4.12'
-    //noinspection NewerVersionAvailable, GradleDynamicVersion
-    testCompile 'org.mockito:mockito-core:2.7.+'
+    //noinspection GradleDynamicVersion
+    testCompile 'org.mockito:mockito-core:2.8.+'
     testCompile 'org.robolectric:robolectric:3.2.2'
     // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

@@ -99,21 +99,20 @@ public View onCreateView(LayoutInflater inflater,
 
         View v = inflater.inflate(R.layout.register_email_layout, container, false);
 
-        mPasswordFieldValidator = new PasswordFieldValidator(
-                (TextInputLayout) v.findViewById(R.id.password_layout),
-                getResources().getInteger(R.integer.min_password_length));
-        mNameValidator = new RequiredFieldValidator(
-                (TextInputLayout) v.findViewById(R.id.name_layout));
-        mEmailFieldValidator = new EmailFieldValidator(
-                (TextInputLayout) v.findViewById(R.id.email_layout));
-
         mEmailEditText = (EditText) v.findViewById(R.id.email);
         mNameEditText = (EditText) v.findViewById(R.id.name);
         mPasswordEditText = (EditText) v.findViewById(R.id.password);
         mAgreementText = (TextView) v.findViewById(R.id.create_account_text);
         mEmailInput = (TextInputLayout) v.findViewById(R.id.email_layout);
         mPasswordInput = (TextInputLayout) v.findViewById(R.id.password_layout);
 
+        mPasswordFieldValidator = new PasswordFieldValidator(
+                mPasswordInput,
+                getResources().getInteger(R.integer.min_password_length));
+        mNameValidator = new RequiredFieldValidator(
+                (TextInputLayout) v.findViewById(R.id.name_layout));
+        mEmailFieldValidator = new EmailFieldValidator(mEmailInput);
+
         ImeHelper.setImeOnDoneListener(mPasswordEditText, this);
 
         mEmailEditText.setOnFocusChangeListener(this);

auth/src/main/res/values/styles.xml

@@ -31,33 +31,6 @@
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
-    <style name="FirebaseUI.Text.T01">
-        <item name="android:textSize">112sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T02">
-        <item name="android:textSize">64sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T03">
-        <item name="android:textSize">48sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T04">
-        <item name="android:textSize">36sp</item>
-        <item name="android:lineSpacingExtra">12sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T05">
-        <item name="android:textSize">24sp</item>
-        <item name="android:lineSpacingExtra">8sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T06">
-        <item name="android:textSize">18sp</item>
-        <item name="android:lineSpacingExtra">6sp</item>
-    </style>
-
     <style name="FirebaseUI.Text.T07">
         <item name="android:textSize">20sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
@@ -69,27 +42,6 @@
         <item name="android:lineSpacingExtra">8sp</item>
     </style>
 
-    <style name="FirebaseUI.Text.T09">
-        <item name="android:textSize">16sp</item>
-        <item name="android:lineSpacingExtra">4sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T11">
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineSpacingExtra">6sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T12">
-        <item name="android:textSize">12sp</item>
-        <item name="android:lineSpacingExtra">4sp</item>
-    </style>
-
-    <style name="FirebaseUI.Text.T13">
-        <item name="android:textSize">10sp</item>
-    </style>
-
     <!-- Common styles -->
     <style name="FirebaseUI.Button" parent="@style/Widget.AppCompat.Button.Colored">
         <item name="android:layout_width">wrap_content</item>

build.gradle

@@ -8,10 +8,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'io.fabric.tools:gradle:1.+'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
@@ -25,20 +24,6 @@ allprojects {
     }
 }
 
-// TODO Remove once either Facebook or Robolectric fix the crash: https://github.com/robolectric/robolectric/issues/2579#issuecomment-276526911
-gradle.taskGraph.whenReady { graph ->
-    graph.allTasks.findAll { it.name ==~ /testReleaseUnitTest/ }*.enabled = false
-}
-
-//Skip Javadoc generation for Java 1.8 as it breaks build
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
-}
-
 /**
  * Configure common tasks on all the submodules
  */
@@ -57,7 +42,7 @@ allprojects { project ->
         project.apply plugin: 'com.android.library'
         android {
             compileSdkVersion compileSdk
-            buildToolsVersion "${buildTools}"
+            buildToolsVersion buildTools
         }
 
         // Task to generate sources JAR

constants.gradle

@@ -8,8 +8,8 @@ project.ext {
     targetSdk = 25
     minSdk = 14
 
-    buildTools = '25.0.2'
+    buildTools = '25.0.3'
 
-    firebaseVersion = '10.2.1'
-    supportLibraryVersion = '25.3.0'
+    firebaseVersion = '10.2.4'
+    supportLibraryVersion = '25.3.1'
 }

database/build.gradle

@@ -22,13 +22,11 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:$supportLibraryVersion"
     compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
     compile "com.google.firebase:firebase-database:$firebaseVersion"
 
     androidTestCompile 'junit:junit:4.12'
-    androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion"
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Mar 04 16:24:17 SGT 2017
+#Mon Apr 24 13:49:38 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

library/quality/lint-baseline.xml

@@ -12,11 +12,11 @@
         <location file="src/main/AndroidManifest.xml"/>
     </issue>
 
+    <!-- These ids are used in the AuthMethodPickerActivityTest.java tests -->
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
-        errorLine1="        &lt;TextView
-"
+        errorLine1="        &lt;TextView"
         errorLine2="        ^">
         <location
             file="src/main/res/layout/register_email_layout.xml"
@@ -27,8 +27,7 @@
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
-        errorLine1="    &lt;TextView
-"
+        errorLine1="    &lt;TextView"
         errorLine2="    ^">
         <location
             file="src/main/res/layout/welcome_back_idp_prompt_layout.xml"
@@ -39,8 +38,7 @@
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
-        errorLine1="    &lt;TextView
-"
+        errorLine1="    &lt;TextView"
         errorLine2="    ^">
         <location
             file="src/main/res/layout/welcome_back_password_prompt_layout.xml"

library/quality/quality.gradle

@@ -7,7 +7,11 @@ def configDir = "${project.rootDir}/library/quality"
 def reportsDir = "${project.buildDir}/reports"
 
 checkstyle {
-    toolVersion = '7.4'
+    toolVersion = '7.7'
+}
+
+pmd {
+    toolVersion = '5.6.0'
 }
 
 task checkstyle(type: Checkstyle) {
@@ -72,7 +76,9 @@ android {
         // We have okio as a transitive dependency, which causes some lint errors due to
         // using Java 8 nio packages. Safely downgrading them to warning.
         // https://github.com/square/okio/issues/58
-        disable 'InvalidPackage', 'NewerVersionAvailable', 'GradleDependency'
+        disable 'InvalidPackage',
+                'NewerVersionAvailable', 'GradleDependency', // For reproducible builds
+                'GradleCompatible' // TODO remove once the tools team fixes lint
 
         baseline file("$configDir/lint-baseline.xml")
         checkAllWarnings true

storage/src/main/java/com/firebase/ui/storage/images/FirebaseImageLoader.java

@@ -48,6 +48,7 @@ private class FirebaseStorageFetcher implements DataFetcher<InputStream> {
         @Override
         public InputStream loadData(Priority priority) throws Exception {
             mStreamTask = mRef.getStream();
+            //noinspection VisibleForTests TODO remove once the tools team fixes lint
             mInputStream = Tasks.await(mStreamTask).getStream();
 
             return mInputStream;