From ab41db474e2a94d672fa44f4f66c34c136f7db46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Sat, 12 Sep 2020 19:41:08 +0200 Subject: [PATCH] Update dokka to 1.5.0 See gh-26870 --- build.gradle | 2 ++ gradle/docs-dokka.gradle | 30 ++++++++++++++++++++++++++++++ settings.gradle | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gradle/docs-dokka.gradle diff --git a/build.gradle b/build.gradle index 059b5fec1d3..474a370a765 100644 --- a/build.gradle +++ b/build.gradle @@ -313,6 +313,8 @@ configure([rootProject] + javaProjects) { project -> pluginManager.withPlugin("kotlin") { apply plugin: "org.jetbrains.dokka" + apply from: "${rootDir}/gradle/docs-dokka.gradle" + compileKotlin { kotlinOptions { languageVersion = "1.3" diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle new file mode 100644 index 00000000000..ee5e4f15d70 --- /dev/null +++ b/gradle/docs-dokka.gradle @@ -0,0 +1,30 @@ +tasks.findByName("dokkaHtmlPartial")?.configure { + outputDirectory.set(new File(buildDir, "docs/kdoc")) + dokkaSourceSets { + configureEach { + sourceRoots.setFrom(file("src/main/kotlin")) + classpath.from(sourceSets["main"].runtimeClasspath) + externalDocumentationLink { + url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/")) + } + externalDocumentationLink { + url.set(new URL("https://projectreactor.io/docs/core/release/api/")) + } + externalDocumentationLink { + url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")) + } + externalDocumentationLink { + url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/")) + } + externalDocumentationLink { + url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/")) + } + externalDocumentationLink { + url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/")) + } + externalDocumentationLink { + url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/")) + } + } + } +} diff --git a/settings.gradle b/settings.gradle index 6c2fb1952c6..8af23c7ca95 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url 'https://repo.spring.io/plugins-release' } + maven { url "https://repo.spring.io/plugins-release" } } }