|
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
|
@@ -36,16 +37,6 @@ allprojects {
|
36 | 37 | mavenLocal()
|
37 | 38 | }
|
38 | 39 |
|
39 |
| - // Skip Javadoc generation for Java 1.8 as it breaks build |
40 |
| - if (JavaVersion.current().isJava8Compatible) { |
41 |
| - tasks.withType<Javadoc> { |
42 |
| - options { |
43 |
| - this as StandardJavadocDocletOptions |
44 |
| - addStringOption("Xdoclint:none", "-quiet") |
45 |
| - } |
46 |
| - } |
47 |
| - } |
48 |
| - |
49 | 40 | if ((group as String).isNotEmpty() && name != "lint" && name != "internal") {
|
50 | 41 | configureAndroid()
|
51 | 42 | configureQuality()
|
@@ -142,9 +133,18 @@ fun Project.setupPublishing() {
|
142 | 133 | }
|
143 | 134 |
|
144 | 135 | val javadoc = task<Javadoc>("javadoc") {
|
145 |
| - setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs) |
146 |
| - classpath += configurations["compile"] |
147 |
| - classpath += project.files(project.the<BaseExtension>().bootClasspath) |
| 136 | + afterEvaluate { |
| 137 | + dependsOn(project.the<LibraryExtension>().libraryVariants.map { it.assemble }) |
| 138 | + |
| 139 | + setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs) |
| 140 | + classpath += files(project.the<BaseExtension>().bootClasspath) |
| 141 | + classpath += files(project.the<LibraryExtension>().libraryVariants.map { |
| 142 | + (it.javaCompiler as AbstractCompile).classpath |
| 143 | + }) |
| 144 | + } |
| 145 | + |
| 146 | + // Ignore warnings about incomplete documentation |
| 147 | + (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") |
148 | 148 | }
|
149 | 149 |
|
150 | 150 | val javadocJar = task<Jar>("javadocJar") {
|
@@ -199,7 +199,7 @@ fun Project.setupPublishing() {
|
199 | 199 | }.toTypedArray())
|
200 | 200 | }
|
201 | 201 | } else {
|
202 |
| - val pomTask = "generatePomFileFor${project.name.capitalize()}LibraryPublication" |
| 202 | + val pomTask = "generatePomFileFor${name.capitalize()}LibraryPublication" |
203 | 203 | task("prepareArtifacts") {
|
204 | 204 | dependsOn(javadocJar, sourcesJar, "assembleRelease", pomTask)
|
205 | 205 | }
|
|
0 commit comments