Update dokka to 1.4.0-rc

willowtreeapps · Aug 5, 2020 · b38254a · b38254a
1 parent 2b2c4c4
commit b38254a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 35 deletions.
diff --git a/assertk-coroutines/build.gradle b/assertk-coroutines/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'org.jetbrains.kotlin.multiplatform'
     id 'org.jetbrains.dokka'
     id 'io.gitlab.arturbosch.detekt'
-    id 'org.ajoberstar.git-publish'
 }
 
 apply from: "$rootProject.projectDir/multiplatform.gradle"

diff --git a/assertk/build.gradle b/assertk/build.gradle
@@ -62,4 +62,4 @@ gitPublish {
     }
 }
 
-gitPublishCopy.dependsOn(dokka)
+gitPublishCopy.dependsOn(dokkaHtml)
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
     id 'org.jetbrains.kotlin.multiplatform' version '1.3.70' apply false
-    id 'org.jetbrains.dokka' version '0.10.0' apply false
+    id 'org.jetbrains.dokka' version '1.4.0-rc' apply false
     id 'io.gitlab.arturbosch.detekt' version '1.5.0' apply false
     id 'org.ajoberstar.git-publish' version '2.1.1' apply false
 }
@@ -58,59 +58,60 @@ configure(subprojects.findAll({ it.name.startsWith('assertk') })) {
 
         tasks.detekt.dependsOn(detektMain, detektTest)
 
-        dokka {
-            outputFormat = 'html'
+        dokkaHtml {
             outputDirectory = "$buildDir/javadoc/"
-            multiplatform {
-                common {}
-                js {}
-                jvm {}
-                linux {}
-                iosArm64 {}
-                iosX64 {}
-                macos {}
+            dokkaSourceSets {
+                commonMain {}
+                jsMain {}
+                jvmMain {
+                    jdkVersion = 8
+                }
+                linuxMain {}
+                iosArm64Main {}
+                iosX64Main {}
+                macosMain {}
+
+                configureEach {
+                    sourceLink {
+                        path = "src"
+                        url = "https://github.com/willowtreeapps/assertk/tree/v${version}/${project.name}/src"
+                        lineSuffix = "#L"
+                    }
+                }
             }
         }
 
         task dokkaCommon(type: DokkaTask) {
-            impliedPlatforms = ["Common"]
-            outputFormat = 'html'
             outputDirectory = "$buildDir/javadoc/common"
-            multiplatform {
-                common {}
+            dokkaSourceSets {
+                commonMain {}
             }
         }
 
         task dokkaJs(type: DokkaTask) {
-            impliedPlatforms = ["JS", "Common"]
-            outputFormat = 'html'
             outputDirectory = "$buildDir/javadoc/js"
-            multiplatform {
-                common {}
-                js {}
+            dokkaSourceSets {
+                commonMain {}
+                jsMain {}
             }
         }
 
         task dokkaJvm(type: DokkaTask) {
-            impliedPlatforms = ["JVM", "Common"]
-            outputFormat = 'html'
             outputDirectory = "$buildDir/javadoc/jvm"
-            multiplatform {
-                common {}
-                jvm {}
+            dokkaSourceSets {
+                commonMain {}
+                jvmMain {}
             }
         }
 
         task dokkaNative(type: DokkaTask) {
-            impliedPlatforms = ["Native", "Common"]
-            outputFormat = 'html'
             outputDirectory = "$buildDir/javadoc/native"
-            multiplatform {
-                common {}
-                linux {}
-                iosArm64 {}
-                iosX64 {}
-                macos {}
+            dokkaSourceSets {
+                commonMain {}
+                linuxMain {}
+                iosArm64Main {}
+                iosX64Main {}
+                macosMain {}
             }
         }
 
@@ -134,6 +135,10 @@ configure(subprojects.findAll({ it.name.startsWith('assertk') })) {
             from "$buildDir/javadoc/native"
         }
 
+        task emptyJavadocJar(type: Jar) {
+            archiveClassifier.set('javadoc')
+        }
+
         task emptySourcesJar(type: Jar) {
             archiveClassifier.set('sources')
         }

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2048m