fix javadoc

Anamorphosee · May 29, 2024 · d2ceaa9 · d2ceaa9
1 parent 0787ee1
commit d2ceaa9
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 37 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,6 +10,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:8.2.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
         classpath("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
     }
 }
 

diff --git a/stacktrace-decoroutinator-android/build.gradle.kts b/stacktrace-decoroutinator-android/build.gradle.kts
@@ -1,8 +1,11 @@
+import com.android.build.gradle.internal.api.DefaultAndroidSourceDirectorySet
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import java.util.*
 
 plugins {
     id("com.android.library")
     id("kotlin-android")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -84,35 +87,25 @@ tasks.named("preBuild") {
     dependsOn(generateBaseContinuationDexSourcesTask)
 }
 
-val androidJavadocs = task("androidJavadocs", Javadoc::class) {
-    setSource(android.sourceSets["main"].java.srcDirs)
-    classpath += files(*android.bootClasspath.toTypedArray())
-    android.libraryVariants.asSequence()
-        .filter { it.name == "release" }
-        .forEach {
-            classpath += it.javaCompileProvider.get().classpath
-        }
-    exclude("**/R.html", "**/R.*.html", "**/index.html")
-}
-
-val androidJavadocsJar = task("androidJavadocsJar", Jar::class) {
-    dependsOn(androidJavadocs)
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
     archiveClassifier.set("javadoc")
-    from(androidJavadocs.destinationDir)
+    from(dokkaJavadocTask.outputDirectory)
 }
 
-val androidSourcesJar = task("androidSourcesJar", Jar::class) {
+val sourcesJar = task("sourcesJar", Jar::class) {
     archiveClassifier.set("sources")
-    from(android.sourceSets["main"].java.srcDirs)
+    from((android.sourceSets["main"].kotlin as DefaultAndroidSourceDirectorySet).srcDirs)
 }
 
 afterEvaluate {
     publishing {
         publications {
             create<MavenPublication>("maven") {
                 from(components["release"])
-                artifact(androidJavadocsJar)
-                artifact(androidSourcesJar)
+                artifact(dokkaJavadocsJar)
+                artifact(sourcesJar)
                 pom {
                     name.set("Stacktrace-decoroutinator Android.")
                     description.set("Android library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-common/build.gradle.kts b/stacktrace-decoroutinator-common/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -24,15 +26,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator common lib.")
                 description.set("Library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-jvm-agent-common/build.gradle.kts b/stacktrace-decoroutinator-jvm-agent-common/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -30,15 +32,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator JVM agent common lib.")
                 description.set("Library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-jvm-common/build.gradle.kts b/stacktrace-decoroutinator-jvm-common/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -28,22 +30,21 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 val appendStdlibClassesTask = task("appendStdlibClasses") {
     dependsOn(":stdlib:classes", "classes")
     doLast {
-        val fromDir = project(":stdlib").buildDir
-            .resolve("classes")
-            .resolve("kotlin")
-            .resolve("main")
-        val intoDir = buildDir
-            .resolve("classes")
-            .resolve("kotlin")
-            .resolve("main")
+        val fromDir = project(":stdlib").layout.buildDirectory.get()
+            .dir("classes")
+            .dir("kotlin")
+            .dir("main")
+        val intoDir = layout.buildDirectory.get()
+            .dir("classes")
+            .dir("kotlin")
+            .dir("main")
         copy {
             from(fromDir)
             into(intoDir)
@@ -52,10 +53,10 @@ val appendStdlibClassesTask = task("appendStdlibClasses") {
         }
         copy {
             val baseCondinuationDir = fromDir
-                .resolve("kotlin")
-                .resolve("coroutines")
-                .resolve("jvm")
-                .resolve("internal")
+                .dir("kotlin")
+                .dir("coroutines")
+                .dir("jvm")
+                .dir("internal")
             from(baseCondinuationDir)
             into(intoDir)
             include("BaseContinuationImpl.class")
@@ -68,10 +69,18 @@ tasks.named("jar") {
     dependsOn(appendStdlibClassesTask)
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator JVM common lib.")
                 description.set("Library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-jvm-legacy-common/build.gradle.kts b/stacktrace-decoroutinator-jvm-legacy-common/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -28,15 +30,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator JVM legacy common lib.")
                 description.set("Library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-jvm-legacy/build.gradle.kts b/stacktrace-decoroutinator-jvm-legacy/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -33,15 +35,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator JVM legacy.")
                 description.set("JVM legacy library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-jvm/build.gradle.kts b/stacktrace-decoroutinator-jvm/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
     jacoco
@@ -38,15 +40,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator JVM.")
                 description.set("JVM library for recovering stack trace in exceptions thrown in Kotlin coroutines.")

diff --git a/stacktrace-decoroutinator-noop/build.gradle.kts b/stacktrace-decoroutinator-noop/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm")
+    id("org.jetbrains.dokka")
     `maven-publish`
     signing
 }
@@ -24,15 +26,22 @@ tasks.withType<KotlinCompile> {
 
 java {
     withSourcesJar()
-    withJavadocJar()
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+val dokkaJavadocsJar = task("dokkaJavadocsJar", Jar::class) {
+    val dokkaJavadocTask = tasks.named<AbstractDokkaTask>("dokkaJavadoc").get()
+    dependsOn(dokkaJavadocTask)
+    archiveClassifier.set("javadoc")
+    from(dokkaJavadocTask.outputDirectory)
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
             from(components["java"])
+            artifact(dokkaJavadocsJar)
             pom {
                 name.set("Stacktrace-decoroutinator noop stub.")
                 description.set("No operation stub for Stacktrace-decoroutinator.")