Skip to content

Commit 79ee9c1

Browse files
committed
Fix most Javadoc warnings
Signed-off-by: Alex Saveau <[email protected]>
1 parent c387047 commit 79ee9c1

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ public PhoneBuilder setDefaultCountryIso(@NonNull String iso) {
660660
* Sets the country codes available in the country code selector for phone
661661
* authentication. Takes as input a List of both country isos and codes.
662662
* This is not to be called with
663-
* {@link #setBlacklistedCountries(List<String>)}.
663+
* {@link #setBlacklistedCountries(List)}.
664664
* If both are called, an exception will be thrown.
665665
* <p>
666666
* Inputting an e-164 country code (e.g. '+1') will include all countries with
@@ -696,7 +696,7 @@ public PhoneBuilder setWhitelistedCountries(
696696
* Sets the countries to be removed from the country code selector for phone
697697
* authentication. Takes as input a List of both country isos and codes.
698698
* This is not to be called with
699-
* {@link #setWhitelistedCountries(List<String>)}.
699+
* {@link #setWhitelistedCountries(List)}.
700700
* If both are called, an exception will be thrown.
701701
* <p>
702702
* 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* Fragment that shows a form with an email field and checks for existing accounts with that email.
3434
* <p>
35-
* Host Activities should implement {@link CheckEmailListener}.
35+
* Host Activities should implement {@link CheckEmailFragment.CheckEmailListener}.
3636
*/
3737
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
3838
public class CheckEmailFragment extends FragmentBase implements

build.gradle.kts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.BaseExtension
2+
import com.android.build.gradle.LibraryExtension
23
import com.jfrog.bintray.gradle.BintrayExtension
34
import com.jfrog.bintray.gradle.tasks.RecordingCopyTask
45
import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
@@ -32,16 +33,6 @@ allprojects {
3233
mavenLocal()
3334
}
3435

35-
// Skip Javadoc generation for Java 1.8 as it breaks build
36-
if (JavaVersion.current().isJava8Compatible) {
37-
tasks.withType<Javadoc> {
38-
options {
39-
this as StandardJavadocDocletOptions
40-
addStringOption("Xdoclint:none", "-quiet")
41-
}
42-
}
43-
}
44-
4536
if ((group as String).isNotEmpty() && name != "lint" && name != "internal") {
4637
configureAndroid()
4738
configureQuality()
@@ -138,9 +129,18 @@ fun Project.setupPublishing() {
138129
}
139130

140131
val javadoc = task<Javadoc>("javadoc") {
141-
setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
142-
classpath += configurations["compile"]
143-
classpath += project.files(project.the<BaseExtension>().bootClasspath)
132+
afterEvaluate {
133+
dependsOn(project.the<LibraryExtension>().libraryVariants.map { it.assemble })
134+
135+
setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
136+
classpath += files(project.the<BaseExtension>().bootClasspath)
137+
classpath += files(project.the<LibraryExtension>().libraryVariants.map {
138+
(it.javaCompiler as AbstractCompile).classpath
139+
})
140+
}
141+
142+
// Ignore warnings about incomplete documentation
143+
(options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
144144
}
145145

146146
val javadocJar = task<Jar>("javadocJar") {
@@ -195,7 +195,7 @@ fun Project.setupPublishing() {
195195
}.toTypedArray())
196196
}
197197
} else {
198-
val pomTask = "generatePomFileFor${project.name.capitalize()}LibraryPublication"
198+
val pomTask = "generatePomFileFor${name.capitalize()}LibraryPublication"
199199
task("prepareArtifacts") {
200200
dependsOn(javadocJar, sourcesJar, "assembleRelease", pomTask)
201201
}

0 commit comments

Comments
 (0)