|
1 | 1 | import com.android.build.gradle.BaseExtension
|
| 2 | +import com.android.build.gradle.LibraryExtension |
2 | 3 | import com.jfrog.bintray.gradle.BintrayExtension
|
3 | 4 | import com.jfrog.bintray.gradle.tasks.RecordingCopyTask
|
4 | 5 | import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
|
@@ -32,16 +33,6 @@ allprojects {
|
32 | 33 | mavenLocal()
|
33 | 34 | }
|
34 | 35 |
|
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 |
| - |
45 | 36 | if ((group as String).isNotEmpty() && name != "lint" && name != "internal") {
|
46 | 37 | configureAndroid()
|
47 | 38 | configureQuality()
|
@@ -138,9 +129,18 @@ fun Project.setupPublishing() {
|
138 | 129 | }
|
139 | 130 |
|
140 | 131 | 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") |
144 | 144 | }
|
145 | 145 |
|
146 | 146 | val javadocJar = task<Jar>("javadocJar") {
|
@@ -195,7 +195,7 @@ fun Project.setupPublishing() {
|
195 | 195 | }.toTypedArray())
|
196 | 196 | }
|
197 | 197 | } else {
|
198 |
| - val pomTask = "generatePomFileFor${project.name.capitalize()}LibraryPublication" |
| 198 | + val pomTask = "generatePomFileFor${name.capitalize()}LibraryPublication" |
199 | 199 | task("prepareArtifacts") {
|
200 | 200 | dependsOn(javadocJar, sourcesJar, "assembleRelease", pomTask)
|
201 | 201 | }
|
|
0 commit comments