Merge branch 'master' into develop

Author: qwwdfsad

gradle.properties

@@ -11,10 +11,10 @@ kotlin_version=1.9.21
 junit_version=4.12
 junit5_version=5.7.0
 atomicfu_version=0.23.1
-knit_version=0.5.0-Beta
+knit_version=0.5.0
 html_version=0.7.2
 lincheck_version=2.18.1
-dokka_version=1.8.10
+dokka_version=1.9.10
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
 reactive_streams_version=1.0.3

gradle/dokka.gradle.kts

@@ -37,31 +37,12 @@ tasks.withType(DokkaTaskPartial::class).configureEach {
     }
 }
 
-fun GradleDokkaSourceSetBuilder.makeLinkMapping(projectDir: File) {
-    sourceLink {
-        val relPath = rootProject.projectDir.toPath().relativize(projectDir.toPath())
-        localDirectory.set(projectDir.resolve("src"))
-        remoteUrl.set(URL("https://github.com/kotlin/kotlinx.coroutines/tree/master/$relPath/src"))
-        remoteLineSuffix.set("#L")
-    }
-}
-
-if (project.isMultiplatform) {
-    // Configuration for MPP modules
-    tasks.withType(DokkaTaskPartial::class).configureEach {
-        // sources in MPP are located in moduleDir/PLATFORM/src,
-        // where PLATFORM could be jvm, js, jdk8, concurrent, etc
-        // configuration happens in buildSrc/src/main/kotlin/SourceSetsKt.configureMultiplatform
-        dokkaSourceSets.matching { it.name.endsWith("Main") }.configureEach {
-            val platform = name.dropLast(4)
-            makeLinkMapping(project.file(platform))
-        }
-    }
-} else {
-    // Configuration for JVM modules
-    tasks.withType(DokkaTaskPartial::class).configureEach {
-        dokkaSourceSets.named("main") {
-            makeLinkMapping(projectDir)
+tasks.withType(DokkaTaskPartial::class).configureEach {
+    dokkaSourceSets.configureEach {
+        sourceLink {
+            localDirectory.set(rootDir)
+            remoteUrl.set(URL("https://github.com/kotlin/kotlinx.coroutines/tree/master"))
+            remoteLineSuffix.set("#L")
         }
     }
 }