Upgrade to Dokka 0.10.1

Closes gh-24764
This commit is contained in:
Sébastien Deleuze
2020-03-23 12:58:39 +01:00
parent b069efade4
commit 623a019ef8
2 changed files with 36 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
id 'org.jetbrains.kotlin.jvm' version '1.3.70' apply false id 'org.jetbrains.kotlin.jvm' version '1.3.70' apply false
id 'org.jetbrains.dokka' version '0.9.18' apply false id 'org.jetbrains.dokka' version '0.10.1' apply false
id 'org.asciidoctor.jvm.convert' version '2.4.0' id 'org.asciidoctor.jvm.convert' version '2.4.0'
id 'io.spring.gradle-enterprise-conventions' version '0.0.2' id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
id 'io.spring.nohttp' version '0.0.4.RELEASE' id 'io.spring.nohttp' version '0.0.4.RELEASE'

View File

@@ -65,34 +65,47 @@ dokka {
dependsOn { dependsOn {
tasks.getByName("api") tasks.getByName("api")
} }
doFirst { doFirst {
classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten() configuration {
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath }) classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
sourceDirs = files(moduleProjects classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
.findAll {
it.pluginManager.hasPlugin("kotlin") moduleProjects.findAll {
it.pluginManager.hasPlugin("kotlin")
}.each { project ->
def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
kotlinDirs -= project.sourceSets.main.java.srcDirs
kotlinDirs.each { dir ->
if (dir.exists()) {
sourceRoot {
path = dir.path
}
}
} }
.collect { project -> }
def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect() }
kotlinDirs -= project.sourceSets.main.java.srcDirs
})
} }
moduleName = "spring-framework"
outputFormat = "html" outputFormat = "html"
outputDirectory = "$buildDir/docs/kdoc" outputDirectory = "$buildDir/docs/kdoc"
externalDocumentationLink { configuration {
url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/") moduleName = "spring-framework"
packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
} externalDocumentationLink {
externalDocumentationLink { url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
url = new URL("https://projectreactor.io/docs/core/release/api/") packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/") url = new URL("https://projectreactor.io/docs/core/release/api/")
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/") url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
}
externalDocumentationLink {
url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
}
} }
} }