aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/projects/serialization/serialization.diff
blob: f6441f1fca74cba87d90100f262ce2dbd574ccc9 (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
diff --git a/build.gradle b/build.gradle
index 83346e98..1871cc2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,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:binary-compatibility-validator:$validator_version"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
 
@@ -89,6 +88,11 @@ buildscript {
     }
 }
 
+plugins {
+    id("org.jetbrains.dokka")
+}
+
+apply from: "../template.root.gradle.kts"
 // To make it visible for compiler-version.gradle
 ext.compilerVersion = org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION
 apply plugin: 'binary-compatibility-validator'
diff --git a/gradle.properties b/gradle.properties
index 9e7c8e3b..085875da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlin.version.snapshot=1.4.255-SNAPSHOT
 
 junit_version=4.12
 jackson_version=2.10.0.pr1
-dokka_version=1.4.20-multimodule-dev-7
+dokka_version=1.4.20
 native.deploy=
 validator_version=0.2.3
 knit_version=0.2.2
diff --git a/settings.gradle b/settings.gradle
index 88bcb942..99055d64 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@
  * Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+apply from: "../template.settings.gradle.kts"
 rootProject.name = 'kotlinx-serialization'
 enableFeaturePreview('GRADLE_METADATA')