1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
diff --git a/build.gradle b/build.gradle
index 23537170..50672336 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,6 @@ buildscript {
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
- classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
classpath "org.jetbrains.kotlinx:kover:$kover_version"
classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$validator_version"
classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
@@ -79,6 +78,10 @@ buildscript {
}
}
+plugins {
+ id("org.jetbrains.dokka")
+}
+
// To make it visible for compiler-version.gradle
ext.compilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION
ext.nativeDebugBuild = org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType.DEBUG
@@ -182,3 +185,5 @@ subprojects {
apply from: rootProject.file('gradle/compiler-version.gradle')
apply from: rootProject.file("gradle/dokka.gradle")
apply from: rootProject.file("gradle/benchmark-parsing.gradle")
+
+apply from: "../template.root.gradle.kts"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4335988b..e642bdd5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.6.255-SNAPSHOT
junit_version=4.12
jackson_version=2.10.0.pr1
-dokka_version=1.4.20-multimodule-dev-7
+dokka_version=1.5.31-SNAPSHOT
native.deploy=
validator_version=0.7.1
knit_version=0.2.2
diff --git a/gradle/dokka.gradle b/gradle/dokka.gradle
index 5b8c66a8..cb697c92 100644
--- a/gradle/dokka.gradle
+++ b/gradle/dokka.gradle
@@ -14,41 +14,41 @@ def documentedSubprojects = ["kotlinx-serialization-core",
subprojects {
if (!(name in documentedSubprojects)) return
apply plugin: 'org.jetbrains.dokka'
- tasks.named('dokkaHtml') {
+ tasks.named('dokkaHtmlPartial') {
outputDirectory = file("build/dokka")
dokkaSourceSets {
configureEach {
includes.from(rootProject.file('dokka/moduledoc.md').path)
perPackageOption {
- prefix.set("kotlinx.serialization")
+ matchingRegex.set("kotlinx.serialization(\$|\\.).*")
reportUndocumented.set(true)
skipDeprecated.set(true)
}
// Internal API
perPackageOption {
- prefix.set("kotlinx.serialization.internal")
+ matchingRegex.set("kotlinx.serialization.internal(\$|\\.).*")
suppress.set(true)
}
// Workaround for typealias
perPackageOption {
- prefix.set("kotlinx.serialization.protobuf.internal")
+ matchingRegex.set("kotlinx.serialization.protobuf.internal(\$|\\.).*")
suppress.set(true)
reportUndocumented.set(false)
}
// Deprecated migrations
perPackageOption {
- prefix.set("kotlinx.protobuf")
+ matchingRegex.set("kotlinx.protobuf(\$|\\.).*")
reportUndocumented.set(true)
skipDeprecated.set(true)
}
// Deprecated migrations
perPackageOption {
- prefix.set("org.jetbrains.kotlinx.serialization.config")
+ matchingRegex.set("org.jetbrains.kotlinx.serialization.config(\$|\\.).*")
reportUndocumented.set(false)
skipDeprecated.set(true)
}
diff --git a/settings.gradle b/settings.gradle
index 27933950..6a6fc80a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,3 +31,5 @@ project(':benchmark').projectDir = file('./benchmark')
include ':guide'
project(':guide').projectDir = file('./guide')
+
+apply from: "../template.settings.gradle.kts"
|
