Skip to content

Commit 623a019

Browse files
committed
Upgrade to Dokka 0.10.1
Closes gh-24764
1 parent b069efa commit 623a019

File tree

2 files changed

+36
-23
lines changed

2 files changed

+36
-23
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
33
id 'org.jetbrains.kotlin.jvm' version '1.3.70' apply false
4-
id 'org.jetbrains.dokka' version '0.9.18' apply false
4+
id 'org.jetbrains.dokka' version '0.10.1' apply false
55
id 'org.asciidoctor.jvm.convert' version '2.4.0'
66
id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
77
id 'io.spring.nohttp' version '0.0.4.RELEASE'

gradle/docs.gradle

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,47 @@ dokka {
6565
dependsOn {
6666
tasks.getByName("api")
6767
}
68+
6869
doFirst {
69-
classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
70-
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
71-
sourceDirs = files(moduleProjects
72-
.findAll {
73-
it.pluginManager.hasPlugin("kotlin")
70+
configuration {
71+
classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
72+
classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
73+
74+
moduleProjects.findAll {
75+
it.pluginManager.hasPlugin("kotlin")
76+
}.each { project ->
77+
def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
78+
kotlinDirs -= project.sourceSets.main.java.srcDirs
79+
kotlinDirs.each { dir ->
80+
if (dir.exists()) {
81+
sourceRoot {
82+
path = dir.path
83+
}
84+
}
7485
}
75-
.collect { project ->
76-
def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
77-
kotlinDirs -= project.sourceSets.main.java.srcDirs
78-
})
86+
}
87+
}
7988
}
80-
moduleName = "spring-framework"
89+
8190
outputFormat = "html"
8291
outputDirectory = "$buildDir/docs/kdoc"
8392

84-
externalDocumentationLink {
85-
url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
86-
packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
87-
}
88-
externalDocumentationLink {
89-
url = new URL("https://projectreactor.io/docs/core/release/api/")
90-
}
91-
externalDocumentationLink {
92-
url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
93-
}
94-
externalDocumentationLink {
95-
url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
93+
configuration {
94+
moduleName = "spring-framework"
95+
96+
externalDocumentationLink {
97+
url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
98+
packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
99+
}
100+
externalDocumentationLink {
101+
url = new URL("https://projectreactor.io/docs/core/release/api/")
102+
}
103+
externalDocumentationLink {
104+
url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
105+
}
106+
externalDocumentationLink {
107+
url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
108+
}
96109
}
97110
}
98111

0 commit comments

Comments
 (0)