Skip to content

Commit 4dadf6f

Browse files
authored
Migrate to DGPv2 (#527)
1 parent 27d39ba commit 4dadf6f

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

core/build.gradle.kts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import java.net.URL
44
import javax.xml.parsers.DocumentBuilderFactory
55
import java.io.ByteArrayOutputStream
66
import java.io.PrintWriter
7-
import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
87
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
98
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
109
import org.jetbrains.kotlin.konan.target.Family
@@ -379,26 +378,31 @@ val downloadWindowsZonesMapping by tasks.registering {
379378
}
380379
}
381380

382-
tasks.withType<AbstractDokkaLeafTask>().configureEach {
383-
pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${projectDir.toString().replace('\\', '/')}/dokka-templates" }"""))
381+
dokka {
382+
pluginsConfiguration.html {
383+
templatesDir.set(projectDir.resolve("dokka-templates"))
384+
}
385+
386+
dokkaPublications.html {
387+
failOnWarning.set(true)
388+
// Enum members and undocumented toString()
389+
suppressInheritedMembers.set(true)
390+
}
384391

385-
failOnWarning.set(true)
386392
dokkaSourceSets.configureEach {
387-
val testSourceSet = kotlin.sourceSets.named("${name.dropLast(4)}Test")
388-
samples.from(testSourceSet.map { it.kotlin.srcDirs })
393+
val platform = name.dropLast(4)
394+
samples.from("$platform/test")
389395

390396
// reportUndocumented.set(true) // much noisy output about `hashCode` and serializer encoders, decoders etc
391397
skipDeprecated.set(true)
392-
// Enum members and undocumented toString()
393-
suppressInheritedMembers.set(true)
394398
// hide the `internal` package, which, on JS, has public members generated by Dukat that would get mentioned
395399
perPackageOption {
396400
matchingRegex.set(".*\\.internal(\\..*)?")
397401
suppress.set(true)
398402
}
399403
sourceLink {
400404
localDirectory.set(rootDir)
401-
remoteUrl.set(URL("https://github.com/kotlin/kotlinx-datetime/tree/latest-release"))
405+
remoteUrl("https://github.com/kotlin/kotlinx-datetime/tree/latest-release")
402406
remoteLineSuffix.set("#L")
403407
}
404408
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ kotlin.native.ignoreIncorrectDependencies=true
2121
kotlin.native.ignoreDisabledTargets=true
2222
kotlin.mpp.applyDefaultHierarchyTemplate=false
2323

24+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
25+
org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true
26+
2427
# stop using pre-HMPP IDEA import workaround in kotlinx.team.infra
2528
useNativeBuildInfraInIdea=true

0 commit comments

Comments
 (0)