blob: 23ce902297b8f5abde201eb17e674ff2773be6c5 (
plain)
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
|
diff --git a/build.gradle b/build.gradle
index 845f7e4e..b3145969 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
@@ -99,7 +102,6 @@ knit {
// Build API docs for all modules with dokka before running Knit
knitPrepare.dependsOn "dokka"
-apply plugin: 'org.jetbrains.dokka'
dependencies {
dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
}
@@ -187,3 +189,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"
+
diff --git a/gradle.properties b/gradle.properties
index 05428604..b4c7b3d1 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.6.0
+dokka_version=for-integration-tests-SNAPSHOT
native.deploy=
validator_version=0.7.1
knit_version=0.3.0
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"
|
