Merge branch 'version-4.2.0-dev' into perf

# Conflicts:
#	build.gradle.kts

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -660,7 +660,7 @@ public PhoneBuilder setDefaultCountryIso(@NonNull String iso) {
              * Sets the country codes available in the country code selector for phone
              * authentication. Takes as input a List of both country isos and codes.
              * This is not to be called with
-             * {@link #setBlacklistedCountries(List<String>)}.
+             * {@link #setBlacklistedCountries(List)}.
              * If both are called, an exception will be thrown.
              * <p>
              * Inputting an e-164 country code (e.g. '+1') will include all countries with
@@ -696,7 +696,7 @@ public PhoneBuilder setWhitelistedCountries(
              * Sets the countries to be removed from the country code selector for phone
              * authentication. Takes as input a List of both country isos and codes.
              * This is not to be called with
-             * {@link #setWhitelistedCountries(List<String>)}.
+             * {@link #setWhitelistedCountries(List)}.
              * If both are called, an exception will be thrown.
              * <p>
              * Inputting an e-164 country code (e.g. '+1') will include all countries with

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

@@ -32,7 +32,7 @@
 /**
  * Fragment that shows a form with an email field and checks for existing accounts with that email.
  * <p>
- * Host Activities should implement {@link CheckEmailListener}.
+ * Host Activities should implement {@link CheckEmailFragment.CheckEmailListener}.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class CheckEmailFragment extends FragmentBase implements

build.gradle.kts

@@ -1,4 +1,5 @@
 import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.LibraryExtension
 import com.jfrog.bintray.gradle.BintrayExtension
 import com.jfrog.bintray.gradle.tasks.RecordingCopyTask
 import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
@@ -42,16 +43,6 @@ allprojects {
         mavenLocal()
     }
 
-    // Skip Javadoc generation for Java 1.8 as it breaks build
-    if (JavaVersion.current().isJava8Compatible) {
-        tasks.withType<Javadoc> {
-            options {
-                this as StandardJavadocDocletOptions
-                addStringOption("Xdoclint:none", "-quiet")
-            }
-        }
-    }
-
     if ((group as String).isNotEmpty() && name != "lint" && name != "internal") {
         configureAndroid()
         configureQuality()
@@ -148,9 +139,18 @@ fun Project.setupPublishing() {
     }
 
     val javadoc = tasks.register<Javadoc>("javadoc") {
-        setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
-        classpath += configurations["compile"]
-        classpath += project.files(project.the<BaseExtension>().bootClasspath)
+        afterEvaluate {
+            dependsOn(project.the<LibraryExtension>().libraryVariants.map { it.assemble })
+
+            setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
+            classpath += files(project.the<BaseExtension>().bootClasspath)
+            classpath += files(project.the<LibraryExtension>().libraryVariants.map {
+                (it.javaCompiler as AbstractCompile).classpath
+            })
+        }
+
+        // Ignore warnings about incomplete documentation
+        (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
     val javadocJar = tasks.register<Jar>("javadocJar") {
@@ -199,7 +199,7 @@ fun Project.setupPublishing() {
                 }.toTypedArray())
             }
         } else {
-            val pomTask = "generatePomFileFor${project.name.capitalize()}LibraryPublication"
+            val pomTask = "generatePomFileFor${name.capitalize()}LibraryPublication"
             tasks.register("prepareArtifacts") {
                 dependsOn(javadocJar, sourcesJar, "assembleRelease", pomTask)
             }