diff --git a/build.gradle.kts b/build.gradle.kts
index 249be82a0d..f5037fb384 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -78,12 +78,13 @@ apiValidation {
 
 knit {
     siteRoot = "https://kotlinlang.org/api/kotlinx.serialization"
-    moduleDocs = "build/dokka/htmlMultiModule"
+    moduleDocs = "build/dokka-module/html/module"
+    dokkaMultiModuleRoot = "build/dokka/html/"
 }
 
 // Build API docs for all modules with dokka before running Knit
 tasks.named("knitPrepare") {
-    dependsOn("dokka")
+    dependsOn("dokkaGenerate")
 }
 
 
@@ -135,17 +136,14 @@ subprojects {
     }
 }
 
-// Knit relies on Dokka task and it's pretty convenient
-tasks.register("dokka") {
-    dependsOn("dokkaHtmlMultiModule")
-}
-
-tasks.withType<DokkaMultiModuleTask>().named("dokkaHtmlMultiModule") {
-    pluginsMapConfiguration.put("org.jetbrains.dokka.base.DokkaBase", """{ "templatesDir": "${projectDir.toString().replace("\\", "/")}/dokka-templates" }""")
-}
-
+// apply conventions to root module and setup dependencies for aggregation
+apply(plugin = "dokka-conventions")
 dependencies {
-    dokkaPlugin(libs.dokka.pathsaver)
+    subprojects.forEach {
+        if (it.name in documentedSubprojects) {
+            dokka(it)
+        }
+    }
 }
 
 // == NPM setup ==
@@ -159,19 +157,23 @@ logger.warn("Project is using Kotlin Gradle plugin version: ${project.getKotlinP
 
 // == projects lists and flags ==
 // getters are required because of variable lazy initialization in Gradle
-val unpublishedProjects get() = setOf(
-    "benchmark",
-    "guide",
-    "kotlinx-serialization-json-tests",
-    "proto-test-model",
-)
+val unpublishedProjects
+    get() = setOf(
+        "benchmark",
+        "guide",
+        "kotlinx-serialization-json-tests",
+        "proto-test-model",
+    )
 val excludedFromBomProjects get() = unpublishedProjects + "kotlinx-serialization-bom"
 
-val documentedSubprojects get() = setOf("kotlinx-serialization-core",
-    "kotlinx-serialization-json",
-    "kotlinx-serialization-json-okio",
-    "kotlinx-serialization-json-io",
-    "kotlinx-serialization-cbor",
-    "kotlinx-serialization-properties",
-    "kotlinx-serialization-hocon",
-    "kotlinx-serialization-protobuf")
+val documentedSubprojects
+    get() = setOf(
+        "kotlinx-serialization-core",
+        "kotlinx-serialization-json",
+        "kotlinx-serialization-json-okio",
+        "kotlinx-serialization-json-io",
+        "kotlinx-serialization-cbor",
+        "kotlinx-serialization-properties",
+        "kotlinx-serialization-hocon",
+        "kotlinx-serialization-protobuf"
+    )
diff --git a/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts b/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
index d30137276b..d64d46a911 100644
--- a/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-conventions.gradle.kts
@@ -1,10 +1,3 @@
-/*
- * Copyright 2017-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-import org.jetbrains.dokka.gradle.*
-import java.net.URI
-
 /*
  * Copyright 2017-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
@@ -18,62 +11,24 @@ dependencies {
     dokkaPlugin(provider { extens.getByType<VersionCatalogsExtension>().named("libs").findLibrary("dokka.pathsaver").get().get() })
 }
 
-tasks.withType<DokkaTaskPartial>().named("dokkaHtmlPartial") {
-    outputDirectory.set(file("build/dokka"))
-
-
-    pluginsMapConfiguration.put("org.jetbrains.dokka.base.DokkaBase", """{ "templatesDir": "${rootDir.resolve("dokka-templates").canonicalPath.replace('\\', '/')}" }""")
-
-    dokkaSourceSets {
-        configureEach {
-            includes.from(rootDir.resolve("dokka/moduledoc.md").path)
-
-            perPackageOption {
-                matchingRegex.set("kotlinx\\.serialization(\$|\\.).*")
-                reportUndocumented.set(true)
-                skipDeprecated.set(true)
-            }
-
-            // Internal API
-            perPackageOption {
-                matchingRegex.set("kotlinx\\.serialization.internal(\$|\\.).*")
-                suppress.set(true)
-            }
-
-            // Internal JSON API
-            perPackageOption {
-                matchingRegex.set("kotlinx\\.serialization.json.internal(\$|\\.).*")
-                suppress.set(true)
-                reportUndocumented.set(false)
-            }
-
-            // Workaround for typealias
-            perPackageOption {
-                matchingRegex.set("kotlinx\\.serialization.protobuf.internal(\$|\\.).*")
-                suppress.set(true)
-                reportUndocumented.set(false)
-            }
-
-            // Deprecated migrations
-            perPackageOption {
-                matchingRegex.set("kotlinx\\.protobuf(\$|\\.).*")
-                reportUndocumented.set(true)
-                skipDeprecated.set(true)
-            }
+dokka {
+    pluginsConfiguration.html {
+        templatesDir = rootDir.resolve("dokka-templates")
+    }
 
-            // Deprecated migrations
-            perPackageOption {
-                matchingRegex.set("org\\.jetbrains\\.kotlinx\\.serialization\\.config(\$|\\.).*")
-                reportUndocumented.set(false)
-                skipDeprecated.set(true)
-            }
+    dokkaSourceSets.configureEach {
+        includes.from(rootDir.resolve("dokka/moduledoc.md").path)
+        reportUndocumented = true
+        skipDeprecated = true
 
-            sourceLink {
-                localDirectory.set(rootDir)
+        perPackageOption {
+            matchingRegex = ".*\\.internal(\\..*)?"
+            suppress = true
+        }
 
-                remoteUrl.set(URI("https://github.com/Kotlin/kotlinx.serialization/tree/master").toURL())
-                remoteLineSuffix.set("#L")
-            }
+        sourceLink {
+            localDirectory = rootDir
+            remoteUrl("https://github.com/Kotlin/kotlinx.serialization/tree/master")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/formats/json-io/build.gradle.kts b/formats/json-io/build.gradle.kts
index 2effe4f2f5..334241fa09 100644
--- a/formats/json-io/build.gradle.kts
+++ b/formats/json-io/build.gradle.kts
@@ -33,12 +33,9 @@ kotlin {
 
 project.configureJava9ModuleInfo()
 
-tasks.named<DokkaTaskPartial>("dokkaHtmlPartial") {
-    dokkaSourceSets {
-        configureEach {
-            externalDocumentationLink {
-                url.set(URI("https://kotlin.github.io/kotlinx-io/").toURL())
-            }
-        }
+dokka.dokkaSourceSets.configureEach {
+    externalDocumentationLinks.register("kotlinx-io") {
+        url("https://kotlinlang.org/api/kotlinx-io/")
+        packageListUrl = file("dokka/kotlinx-io.package-list").toURI()
     }
 }
diff --git a/formats/json-io/dokka/kotlinx-io.package-list b/formats/json-io/dokka/kotlinx-io.package-list
new file mode 100644
index 0000000000..867ab49bd0
--- /dev/null
+++ b/formats/json-io/dokka/kotlinx-io.package-list
@@ -0,0 +1,10 @@
+$dokka.format:html-v1
+$dokka.linkExtension:html
+
+module:kotlinx-io-bytestring
+kotlinx.io.bytestring
+module:kotlinx-io-core
+kotlinx.io
+kotlinx.io.files
+module:kotlinx-io-okio
+kotlinx.io.okio
diff --git a/formats/json-okio/build.gradle.kts b/formats/json-okio/build.gradle.kts
index 93513985c1..1d165755a9 100644
--- a/formats/json-okio/build.gradle.kts
+++ b/formats/json-okio/build.gradle.kts
@@ -34,15 +34,9 @@ kotlin {
 
 project.configureJava9ModuleInfo()
 
-tasks.named<DokkaTaskPartial>("dokkaHtmlPartial") {
-    dokkaSourceSets {
-        configureEach {
-            externalDocumentationLink {
-                url.set(URI("https://square.github.io/okio/3.x/okio/").toURL())
-                packageListUrl.set(
-                    file("dokka/okio.package.list").toURI().toURL()
-                )
-            }
-        }
+dokka.dokkaSourceSets.configureEach {
+    externalDocumentationLinks.register("okio") {
+        url("https://square.github.io/okio/3.x/okio")
+        packageListUrl = file("dokka/okio.package-list").toURI()
     }
 }
diff --git a/formats/json-okio/dokka/okio.package.list b/formats/json-okio/dokka/okio.package-list
similarity index 89%
rename from formats/json-okio/dokka/okio.package.list
rename to formats/json-okio/dokka/okio.package-list
index 96713f52e9..2673ba6038 100644
--- a/formats/json-okio/dokka/okio.package.list
+++ b/formats/json-okio/dokka/okio.package-list
@@ -2,23 +2,27 @@ $dokka.format:html-v1
 $dokka.linkExtension:html
 $dokka.location:okio////PointingToDeclaration/okio/okio/index.html
 $dokka.location:okio//Okio/#/PointingToDeclaration/okio/okio/-okio.html
+$dokka.location:okio//SYSTEM/okio.FileSystem.Companion#/PointingToDeclaration/okio/okio/-s-y-s-t-e-m.html
 $dokka.location:okio//Utf8/#/PointingToDeclaration/okio/okio/-utf8.html
 $dokka.location:okio//appendingSink/java.io.File#/PointingToDeclaration/okio/okio/appending-sink.html
+$dokka.location:okio//asOkioSocket/java.net.Socket#/PointingToDeclaration/okio/okio/as-okio-socket.html
 $dokka.location:okio//asResourceFileSystem/java.lang.ClassLoader#/PointingToDeclaration/okio/okio/as-resource-file-system.html
 $dokka.location:okio//blackholeSink/#/PointingToDeclaration/okio/okio/blackhole-sink.html
 $dokka.location:okio//buffer/okio.Sink#/PointingToDeclaration/okio/okio/buffer.html
 $dokka.location:okio//buffer/okio.Source#/PointingToDeclaration/okio/okio/buffer.html
 $dokka.location:okio//cipherSink/okio.Sink#javax.crypto.Cipher/PointingToDeclaration/okio/okio/cipher-sink.html
 $dokka.location:okio//cipherSource/okio.Source#javax.crypto.Cipher/PointingToDeclaration/okio/okio/cipher-source.html
-$dokka.location:okio//deflate/okio.Sink#java.util.zip.Deflater/PointingToDeclaration/okio/okio/deflate.html
+$dokka.location:okio//deflate/okio.Sink#okio.Deflater/PointingToDeclaration/okio/okio/deflate.html
 $dokka.location:okio//gzip/okio.Sink#/PointingToDeclaration/okio/okio/gzip.html
 $dokka.location:okio//gzip/okio.Source#/PointingToDeclaration/okio/okio/gzip.html
 $dokka.location:okio//hashingSink/okio.Sink#java.security.MessageDigest/PointingToDeclaration/okio/okio/hashing-sink.html
 $dokka.location:okio//hashingSink/okio.Sink#javax.crypto.Mac/PointingToDeclaration/okio/okio/hashing-sink.html
 $dokka.location:okio//hashingSource/okio.Source#java.security.MessageDigest/PointingToDeclaration/okio/okio/hashing-source.html
 $dokka.location:okio//hashingSource/okio.Source#javax.crypto.Mac/PointingToDeclaration/okio/okio/hashing-source.html
-$dokka.location:okio//inflate/okio.Source#java.util.zip.Inflater/PointingToDeclaration/okio/okio/inflate.html
+$dokka.location:okio//inMemorySocketPair/#kotlin.Long/PointingToDeclaration/okio/okio/in-memory-socket-pair.html
+$dokka.location:okio//inflate/okio.Source#okio.Inflater/PointingToDeclaration/okio/okio/inflate.html
 $dokka.location:okio//openZip/okio.FileSystem#okio.Path/PointingToDeclaration/okio/okio/open-zip.html
+$dokka.location:okio//readByteString/kotlinx.cinterop.CPointer[kotlinx.cinterop.CPointed]#kotlin.Int/PointingToDeclaration/okio/okio/read-byte-string.html
 $dokka.location:okio//sink/java.io.File#kotlin.Boolean/PointingToDeclaration/okio/okio/sink.html
 $dokka.location:okio//sink/java.io.OutputStream#/PointingToDeclaration/okio/okio/sink.html
 $dokka.location:okio//sink/java.net.Socket#/PointingToDeclaration/okio/okio/sink.html
@@ -29,14 +33,13 @@ $dokka.location:okio//source/java.net.Socket#/PointingToDeclaration/okio/okio/s
 $dokka.location:okio//source/java.nio.file.Path#kotlin.Array[java.nio.file.OpenOption]/PointingToDeclaration/okio/okio/source.html
 $dokka.location:okio//use/TypeParam(bounds=[okio.Closeable?])#kotlin.Function1[TypeParam(bounds=[okio.Closeable?]),TypeParam(bounds=[kotlin.Any?])]/PointingToDeclaration/okio/okio/use.html
 $dokka.location:okio//utf8Size/kotlin.String#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/utf8-size.html
+$dokka.location:okio//withLock/java.util.concurrent.locks.ReentrantLock#kotlin.Function0[TypeParam(bounds=[kotlin.Any?])]/PointingToDeclaration/okio/okio/with-lock.html
 $dokka.location:okio//withLock/okio.Lock#kotlin.Function0[TypeParam(bounds=[kotlin.Any?])]/PointingToDeclaration/okio/okio/with-lock.html
 $dokka.location:okio/ArrayIndexOutOfBoundsException///PointingToDeclaration/okio/okio/-array-index-out-of-bounds-exception/index.html
 $dokka.location:okio/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsException/#kotlin.String?/PointingToDeclaration/okio/okio/-array-index-out-of-bounds-exception/-array-index-out-of-bounds-exception.html
-$dokka.location:okio/AsyncTimeout.Companion///PointingToDeclaration/okio/okio/-async-timeout/-companion/index.html
-$dokka.location:okio/AsyncTimeout.Companion/condition/#/PointingToDeclaration/okio/okio/-async-timeout/-companion/condition.html
-$dokka.location:okio/AsyncTimeout.Companion/lock/#/PointingToDeclaration/okio/okio/-async-timeout/-companion/lock.html
 $dokka.location:okio/AsyncTimeout///PointingToDeclaration/okio/okio/-async-timeout/index.html
 $dokka.location:okio/AsyncTimeout/AsyncTimeout/#/PointingToDeclaration/okio/okio/-async-timeout/-async-timeout.html
+$dokka.location:okio/AsyncTimeout/cancel/#/PointingToDeclaration/okio/okio/-async-timeout/cancel.html
 $dokka.location:okio/AsyncTimeout/enter/#/PointingToDeclaration/okio/okio/-async-timeout/enter.html
 $dokka.location:okio/AsyncTimeout/exit/#/PointingToDeclaration/okio/okio/-async-timeout/exit.html
 $dokka.location:okio/AsyncTimeout/sink/#okio.Sink/PointingToDeclaration/okio/okio/-async-timeout/sink.html
@@ -60,7 +63,7 @@ $dokka.location:okio/Buffer/Buffer/#/PointingToDeclaration/okio/okio/-buffer/-b
 $dokka.location:okio/Buffer/buffer/#/PointingToDeclaration/okio/okio/-buffer/buffer.html
 $dokka.location:okio/Buffer/clear/#/PointingToDeclaration/okio/okio/-buffer/clear.html
 $dokka.location:okio/Buffer/clone/#/PointingToDeclaration/okio/okio/-buffer/clone.html
-$dokka.location:okio/Buffer/close/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]close.html
+$dokka.location:okio/Buffer/close/#/PointingToDeclaration/okio/okio/-buffer/close.html
 $dokka.location:okio/Buffer/completeSegmentByteCount/#/PointingToDeclaration/okio/okio/-buffer/complete-segment-byte-count.html
 $dokka.location:okio/Buffer/copy/#/PointingToDeclaration/okio/okio/-buffer/copy.html
 $dokka.location:okio/Buffer/copyTo/#java.io.OutputStream#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/copy-to.html
@@ -69,62 +72,64 @@ $dokka.location:okio/Buffer/copyTo/#okio.Buffer#kotlin.Long/PointingToDeclaratio
 $dokka.location:okio/Buffer/emit/#/PointingToDeclaration/okio/okio/-buffer/emit.html
 $dokka.location:okio/Buffer/emitCompleteSegments/#/PointingToDeclaration/okio/okio/-buffer/emit-complete-segments.html
 $dokka.location:okio/Buffer/equals/#kotlin.Any?/PointingToDeclaration/okio/okio/-buffer/[non-jvm]equals.html
-$dokka.location:okio/Buffer/exhausted/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]exhausted.html
-$dokka.location:okio/Buffer/flush/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]flush.html
+$dokka.location:okio/Buffer/exhausted/#/PointingToDeclaration/okio/okio/-buffer/exhausted.html
+$dokka.location:okio/Buffer/flush/#/PointingToDeclaration/okio/okio/-buffer/flush.html
 $dokka.location:okio/Buffer/get/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/get.html
 $dokka.location:okio/Buffer/hashCode/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]hash-code.html
 $dokka.location:okio/Buffer/hmacSha1/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/hmac-sha1.html
 $dokka.location:okio/Buffer/hmacSha256/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/hmac-sha256.html
 $dokka.location:okio/Buffer/hmacSha512/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/hmac-sha512.html
-$dokka.location:okio/Buffer/indexOf/#kotlin.Byte#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of.html
-$dokka.location:okio/Buffer/indexOf/#kotlin.Byte#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of.html
-$dokka.location:okio/Buffer/indexOf/#kotlin.Byte/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of.html
-$dokka.location:okio/Buffer/indexOf/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of.html
-$dokka.location:okio/Buffer/indexOf/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of.html
-$dokka.location:okio/Buffer/indexOfElement/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of-element.html
-$dokka.location:okio/Buffer/indexOfElement/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/[non-jvm]index-of-element.html
+$dokka.location:okio/Buffer/indexOf/#kotlin.Byte#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOf/#kotlin.Byte#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOf/#kotlin.Byte/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOf/#okio.ByteString#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOf/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOf/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/index-of.html
+$dokka.location:okio/Buffer/indexOfElement/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/index-of-element.html
+$dokka.location:okio/Buffer/indexOfElement/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/index-of-element.html
 $dokka.location:okio/Buffer/inputStream/#/PointingToDeclaration/okio/okio/-buffer/input-stream.html
 $dokka.location:okio/Buffer/isOpen/#/PointingToDeclaration/okio/okio/-buffer/is-open.html
 $dokka.location:okio/Buffer/md5/#/PointingToDeclaration/okio/okio/-buffer/md5.html
 $dokka.location:okio/Buffer/outputStream/#/PointingToDeclaration/okio/okio/-buffer/output-stream.html
-$dokka.location:okio/Buffer/peek/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]peek.html
-$dokka.location:okio/Buffer/rangeEquals/#kotlin.Long#okio.ByteString#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/[non-jvm]range-equals.html
-$dokka.location:okio/Buffer/rangeEquals/#kotlin.Long#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/[non-jvm]range-equals.html
+$dokka.location:okio/Buffer/peek/#/PointingToDeclaration/okio/okio/-buffer/peek.html
+$dokka.location:okio/Buffer/rangeEquals/#kotlin.Long#okio.ByteString#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/range-equals.html
+$dokka.location:okio/Buffer/rangeEquals/#kotlin.Long#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/range-equals.html
 $dokka.location:okio/Buffer/read/#java.nio.ByteBuffer/PointingToDeclaration/okio/okio/-buffer/read.html
-$dokka.location:okio/Buffer/read/#kotlin.ByteArray#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read.html
-$dokka.location:okio/Buffer/read/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read.html
-$dokka.location:okio/Buffer/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read.html
-$dokka.location:okio/Buffer/readAll/#okio.Sink/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-all.html
+$dokka.location:okio/Buffer/read/#kotlin.ByteArray#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/read.html
+$dokka.location:okio/Buffer/read/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-buffer/read.html
+$dokka.location:okio/Buffer/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read.html
+$dokka.location:okio/Buffer/readAll/#okio.Sink/PointingToDeclaration/okio/okio/-buffer/read-all.html
 $dokka.location:okio/Buffer/readAndWriteUnsafe/#okio.Buffer.UnsafeCursor/PointingToDeclaration/okio/okio/-buffer/read-and-write-unsafe.html
-$dokka.location:okio/Buffer/readByte/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-byte.html
-$dokka.location:okio/Buffer/readByteArray/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-byte-array.html
-$dokka.location:okio/Buffer/readByteArray/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-byte-array.html
-$dokka.location:okio/Buffer/readByteString/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-byte-string.html
-$dokka.location:okio/Buffer/readByteString/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-byte-string.html
-$dokka.location:okio/Buffer/readDecimalLong/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-decimal-long.html
+$dokka.location:okio/Buffer/readByte/#/PointingToDeclaration/okio/okio/-buffer/read-byte.html
+$dokka.location:okio/Buffer/readByteArray/#/PointingToDeclaration/okio/okio/-buffer/read-byte-array.html
+$dokka.location:okio/Buffer/readByteArray/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-byte-array.html
+$dokka.location:okio/Buffer/readByteString/#/PointingToDeclaration/okio/okio/-buffer/read-byte-string.html
+$dokka.location:okio/Buffer/readByteString/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-byte-string.html
+$dokka.location:okio/Buffer/readDecimalLong/#/PointingToDeclaration/okio/okio/-buffer/read-decimal-long.html
 $dokka.location:okio/Buffer/readFrom/#java.io.InputStream#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-from.html
 $dokka.location:okio/Buffer/readFrom/#java.io.InputStream/PointingToDeclaration/okio/okio/-buffer/read-from.html
-$dokka.location:okio/Buffer/readFully/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-fully.html
-$dokka.location:okio/Buffer/readFully/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-fully.html
-$dokka.location:okio/Buffer/readHexadecimalUnsignedLong/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-hexadecimal-unsigned-long.html
-$dokka.location:okio/Buffer/readInt/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-int.html
-$dokka.location:okio/Buffer/readIntLe/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-int-le.html
-$dokka.location:okio/Buffer/readLong/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-long.html
-$dokka.location:okio/Buffer/readLongLe/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-long-le.html
-$dokka.location:okio/Buffer/readShort/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-short.html
-$dokka.location:okio/Buffer/readShortLe/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-short-le.html
+$dokka.location:okio/Buffer/readFully/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-buffer/read-fully.html
+$dokka.location:okio/Buffer/readFully/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-fully.html
+$dokka.location:okio/Buffer/readHexadecimalUnsignedLong/#/PointingToDeclaration/okio/okio/-buffer/read-hexadecimal-unsigned-long.html
+$dokka.location:okio/Buffer/readInt/#/PointingToDeclaration/okio/okio/-buffer/read-int.html
+$dokka.location:okio/Buffer/readIntLe/#/PointingToDeclaration/okio/okio/-buffer/read-int-le.html
+$dokka.location:okio/Buffer/readLong/#/PointingToDeclaration/okio/okio/-buffer/read-long.html
+$dokka.location:okio/Buffer/readLongLe/#/PointingToDeclaration/okio/okio/-buffer/read-long-le.html
+$dokka.location:okio/Buffer/readShort/#/PointingToDeclaration/okio/okio/-buffer/read-short.html
+$dokka.location:okio/Buffer/readShortLe/#/PointingToDeclaration/okio/okio/-buffer/read-short-le.html
 $dokka.location:okio/Buffer/readString/#java.nio.charset.Charset/PointingToDeclaration/okio/okio/-buffer/read-string.html
 $dokka.location:okio/Buffer/readString/#kotlin.Long#java.nio.charset.Charset/PointingToDeclaration/okio/okio/-buffer/read-string.html
 $dokka.location:okio/Buffer/readUnsafe/#okio.Buffer.UnsafeCursor/PointingToDeclaration/okio/okio/-buffer/read-unsafe.html
-$dokka.location:okio/Buffer/readUtf8/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8.html
-$dokka.location:okio/Buffer/readUtf8/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8.html
-$dokka.location:okio/Buffer/readUtf8CodePoint/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8-code-point.html
-$dokka.location:okio/Buffer/readUtf8Line/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8-line.html
-$dokka.location:okio/Buffer/readUtf8LineStrict/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8-line-strict.html
-$dokka.location:okio/Buffer/readUtf8LineStrict/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]read-utf8-line-strict.html
-$dokka.location:okio/Buffer/request/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]request.html
-$dokka.location:okio/Buffer/require/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]require.html
-$dokka.location:okio/Buffer/select/#okio.Options/PointingToDeclaration/okio/okio/-buffer/[non-jvm]select.html
+$dokka.location:okio/Buffer/readUtf8/#/PointingToDeclaration/okio/okio/-buffer/read-utf8.html
+$dokka.location:okio/Buffer/readUtf8/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-utf8.html
+$dokka.location:okio/Buffer/readUtf8CodePoint/#/PointingToDeclaration/okio/okio/-buffer/read-utf8-code-point.html
+$dokka.location:okio/Buffer/readUtf8Line/#/PointingToDeclaration/okio/okio/-buffer/read-utf8-line.html
+$dokka.location:okio/Buffer/readUtf8LineStrict/#/PointingToDeclaration/okio/okio/-buffer/read-utf8-line-strict.html
+$dokka.location:okio/Buffer/readUtf8LineStrict/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/read-utf8-line-strict.html
+$dokka.location:okio/Buffer/request/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/request.html
+$dokka.location:okio/Buffer/require/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/require.html
+$dokka.location:okio/Buffer/select/#okio.Options/PointingToDeclaration/okio/okio/-buffer/select.html
+$dokka.location:okio/Buffer/select/#okio.TypedOptions[TypeParam(bounds=[kotlin.Any])]/PointingToDeclaration/okio/okio/-buffer/select.html
 $dokka.location:okio/Buffer/sha1/#/PointingToDeclaration/okio/okio/-buffer/sha1.html
 $dokka.location:okio/Buffer/sha256/#/PointingToDeclaration/okio/okio/-buffer/sha256.html
 $dokka.location:okio/Buffer/sha512/#/PointingToDeclaration/okio/okio/-buffer/sha512.html
@@ -132,16 +137,16 @@ $dokka.location:okio/Buffer/size/#/PointingToDeclaration/okio/okio/-buffer/size
 $dokka.location:okio/Buffer/skip/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/skip.html
 $dokka.location:okio/Buffer/snapshot/#/PointingToDeclaration/okio/okio/-buffer/snapshot.html
 $dokka.location:okio/Buffer/snapshot/#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/snapshot.html
-$dokka.location:okio/Buffer/timeout/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]timeout.html
+$dokka.location:okio/Buffer/timeout/#/PointingToDeclaration/okio/okio/-buffer/timeout.html
 $dokka.location:okio/Buffer/toString/#/PointingToDeclaration/okio/okio/-buffer/[non-jvm]to-string.html
 $dokka.location:okio/Buffer/write/#java.nio.ByteBuffer/PointingToDeclaration/okio/okio/-buffer/write.html
 $dokka.location:okio/Buffer/write/#kotlin.ByteArray#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/write.html
 $dokka.location:okio/Buffer/write/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-buffer/write.html
-$dokka.location:okio/Buffer/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/[non-jvm]write.html
+$dokka.location:okio/Buffer/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/write.html
 $dokka.location:okio/Buffer/write/#okio.ByteString#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/write.html
 $dokka.location:okio/Buffer/write/#okio.ByteString/PointingToDeclaration/okio/okio/-buffer/write.html
 $dokka.location:okio/Buffer/write/#okio.Source#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/write.html
-$dokka.location:okio/Buffer/writeAll/#okio.Source/PointingToDeclaration/okio/okio/-buffer/[non-jvm]write-all.html
+$dokka.location:okio/Buffer/writeAll/#okio.Source/PointingToDeclaration/okio/okio/-buffer/write-all.html
 $dokka.location:okio/Buffer/writeByte/#kotlin.Int/PointingToDeclaration/okio/okio/-buffer/write-byte.html
 $dokka.location:okio/Buffer/writeDecimalLong/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/write-decimal-long.html
 $dokka.location:okio/Buffer/writeHexadecimalUnsignedLong/#kotlin.Long/PointingToDeclaration/okio/okio/-buffer/write-hexadecimal-unsigned-long.html
@@ -189,6 +194,7 @@ $dokka.location:okio/BufferedSource/exhausted/#/PointingToDeclaration/okio/okio
 $dokka.location:okio/BufferedSource/indexOf/#kotlin.Byte#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
 $dokka.location:okio/BufferedSource/indexOf/#kotlin.Byte#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
 $dokka.location:okio/BufferedSource/indexOf/#kotlin.Byte/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
+$dokka.location:okio/BufferedSource/indexOf/#okio.ByteString#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
 $dokka.location:okio/BufferedSource/indexOf/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
 $dokka.location:okio/BufferedSource/indexOf/#okio.ByteString/PointingToDeclaration/okio/okio/-buffered-source/index-of.html
 $dokka.location:okio/BufferedSource/indexOfElement/#okio.ByteString#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/index-of-element.html
@@ -226,6 +232,7 @@ $dokka.location:okio/BufferedSource/readUtf8LineStrict/#kotlin.Long/PointingToDe
 $dokka.location:okio/BufferedSource/request/#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/request.html
 $dokka.location:okio/BufferedSource/require/#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/require.html
 $dokka.location:okio/BufferedSource/select/#okio.Options/PointingToDeclaration/okio/okio/-buffered-source/select.html
+$dokka.location:okio/BufferedSource/select/#okio.TypedOptions[TypeParam(bounds=[kotlin.Any])]/PointingToDeclaration/okio/okio/-buffered-source/select.html
 $dokka.location:okio/BufferedSource/skip/#kotlin.Long/PointingToDeclaration/okio/okio/-buffered-source/skip.html
 $dokka.location:okio/ByteString.Companion///PointingToDeclaration/okio/okio/-byte-string/-companion/index.html
 $dokka.location:okio/ByteString.Companion/EMPTY/#/PointingToDeclaration/okio/okio/-byte-string/-companion/-e-m-p-t-y.html
@@ -235,9 +242,9 @@ $dokka.location:okio/ByteString.Companion/encode/kotlin.String#java.nio.charset.
 $dokka.location:okio/ByteString.Companion/encodeUtf8/kotlin.String#/PointingToDeclaration/okio/okio/-byte-string/-companion/encode-utf8.html
 $dokka.location:okio/ByteString.Companion/of/#kotlin.ByteArray/PointingToDeclaration/okio/okio/-byte-string/-companion/of.html
 $dokka.location:okio/ByteString.Companion/readByteString/java.io.InputStream#kotlin.Int/PointingToDeclaration/okio/okio/-byte-string/-companion/read-byte-string.html
-$dokka.location:okio/ByteString.Companion/toByteString/[Error type: Unresolved type for NSData]#/PointingToDeclaration/okio/okio/-byte-string/-companion/to-byte-string.html
 $dokka.location:okio/ByteString.Companion/toByteString/java.nio.ByteBuffer#/PointingToDeclaration/okio/okio/-byte-string/-companion/to-byte-string.html
 $dokka.location:okio/ByteString.Companion/toByteString/kotlin.ByteArray#kotlin.Int#kotlin.Int/PointingToDeclaration/okio/okio/-byte-string/-companion/to-byte-string.html
+$dokka.location:okio/ByteString.Companion/toByteString/platform.Foundation.NSData#/PointingToDeclaration/okio/okio/-byte-string/-companion/to-byte-string.html
 $dokka.location:okio/ByteString///PointingToDeclaration/okio/okio/-byte-string/index.html
 $dokka.location:okio/ByteString/asByteBuffer/#/PointingToDeclaration/okio/okio/-byte-string/as-byte-buffer.html
 $dokka.location:okio/ByteString/base64/#/PointingToDeclaration/okio/okio/-byte-string/base64.html
@@ -289,14 +296,22 @@ $dokka.location:okio/CipherSource/read/#okio.Buffer#kotlin.Long/PointingToDeclar
 $dokka.location:okio/CipherSource/timeout/#/PointingToDeclaration/okio/okio/-cipher-source/timeout.html
 $dokka.location:okio/Closeable///PointingToDeclaration/okio/okio/-closeable/index.html
 $dokka.location:okio/Closeable/close/#/PointingToDeclaration/okio/okio/-closeable/close.html
+$dokka.location:okio/Deflater///PointingToDeclaration/okio/okio/-deflater/index.html
+$dokka.location:okio/Deflater/Deflater/#/PointingToDeclaration/okio/okio/-deflater/-deflater.html
+$dokka.location:okio/Deflater/Deflater/#kotlin.Int#kotlin.Boolean/PointingToDeclaration/okio/okio/-deflater/-deflater.html
+$dokka.location:okio/Deflater/end/#/PointingToDeclaration/okio/okio/-deflater/end.html
+$dokka.location:okio/Deflater/flush/#/PointingToDeclaration/okio/okio/-deflater/flush.html
+$dokka.location:okio/Deflater/getBytesRead/#/PointingToDeclaration/okio/okio/-deflater/get-bytes-read.html
 $dokka.location:okio/DeflaterSink///PointingToDeclaration/okio/okio/-deflater-sink/index.html
 $dokka.location:okio/DeflaterSink/DeflaterSink/#okio.Sink#java.util.zip.Deflater/PointingToDeclaration/okio/okio/-deflater-sink/-deflater-sink.html
+$dokka.location:okio/DeflaterSink/DeflaterSink/#okio.Sink#okio.Deflater/PointingToDeclaration/okio/okio/-deflater-sink/-deflater-sink.html
 $dokka.location:okio/DeflaterSink/close/#/PointingToDeclaration/okio/okio/-deflater-sink/close.html
 $dokka.location:okio/DeflaterSink/flush/#/PointingToDeclaration/okio/okio/-deflater-sink/flush.html
 $dokka.location:okio/DeflaterSink/timeout/#/PointingToDeclaration/okio/okio/-deflater-sink/timeout.html
 $dokka.location:okio/DeflaterSink/toString/#/PointingToDeclaration/okio/okio/-deflater-sink/to-string.html
 $dokka.location:okio/DeflaterSink/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-deflater-sink/write.html
 $dokka.location:okio/EOFException///PointingToDeclaration/okio/okio/-e-o-f-exception/index.html
+$dokka.location:okio/EOFException/EOFException/#/PointingToDeclaration/okio/okio/-e-o-f-exception/-e-o-f-exception.html
 $dokka.location:okio/EOFException/EOFException/#kotlin.String?/PointingToDeclaration/okio/okio/-e-o-f-exception/-e-o-f-exception.html
 $dokka.location:okio/FileHandle///PointingToDeclaration/okio/okio/-file-handle/index.html
 $dokka.location:okio/FileHandle/FileHandle/#kotlin.Boolean/PointingToDeclaration/okio/okio/-file-handle/-file-handle.html
@@ -343,6 +358,7 @@ $dokka.location:okio/FileSystem/appendingSink/#okio.Path#kotlin.Boolean/Pointing
 $dokka.location:okio/FileSystem/appendingSink/#okio.Path/PointingToDeclaration/okio/okio/-file-system/appending-sink.html
 $dokka.location:okio/FileSystem/atomicMove/#okio.Path#okio.Path/PointingToDeclaration/okio/okio/-file-system/atomic-move.html
 $dokka.location:okio/FileSystem/canonicalize/#okio.Path/PointingToDeclaration/okio/okio/-file-system/canonicalize.html
+$dokka.location:okio/FileSystem/close/#/PointingToDeclaration/okio/okio/-file-system/close.html
 $dokka.location:okio/FileSystem/copy/#okio.Path#okio.Path/PointingToDeclaration/okio/okio/-file-system/copy.html
 $dokka.location:okio/FileSystem/createDirectories/#okio.Path#kotlin.Boolean/PointingToDeclaration/okio/okio/-file-system/create-directories.html
 $dokka.location:okio/FileSystem/createDirectories/#okio.Path/PointingToDeclaration/okio/okio/-file-system/create-directories.html
@@ -373,6 +389,7 @@ $dokka.location:okio/ForwardingFileSystem/ForwardingFileSystem/#okio.FileSystem/
 $dokka.location:okio/ForwardingFileSystem/appendingSink/#okio.Path#kotlin.Boolean/PointingToDeclaration/okio/okio/-forwarding-file-system/appending-sink.html
 $dokka.location:okio/ForwardingFileSystem/atomicMove/#okio.Path#okio.Path/PointingToDeclaration/okio/okio/-forwarding-file-system/atomic-move.html
 $dokka.location:okio/ForwardingFileSystem/canonicalize/#okio.Path/PointingToDeclaration/okio/okio/-forwarding-file-system/canonicalize.html
+$dokka.location:okio/ForwardingFileSystem/close/#/PointingToDeclaration/okio/okio/-forwarding-file-system/close.html
 $dokka.location:okio/ForwardingFileSystem/createDirectory/#okio.Path#kotlin.Boolean/PointingToDeclaration/okio/okio/-forwarding-file-system/create-directory.html
 $dokka.location:okio/ForwardingFileSystem/createSymlink/#okio.Path#okio.Path/PointingToDeclaration/okio/okio/-forwarding-file-system/create-symlink.html
 $dokka.location:okio/ForwardingFileSystem/delegate/#/PointingToDeclaration/okio/okio/-forwarding-file-system/delegate.html
@@ -405,6 +422,8 @@ $dokka.location:okio/ForwardingSource/timeout/#/PointingToDeclaration/okio/okio
 $dokka.location:okio/ForwardingSource/toString/#/PointingToDeclaration/okio/okio/-forwarding-source/to-string.html
 $dokka.location:okio/ForwardingTimeout///PointingToDeclaration/okio/okio/-forwarding-timeout/index.html
 $dokka.location:okio/ForwardingTimeout/ForwardingTimeout/#okio.Timeout/PointingToDeclaration/okio/okio/-forwarding-timeout/-forwarding-timeout.html
+$dokka.location:okio/ForwardingTimeout/awaitSignal/#java.util.concurrent.locks.Condition/PointingToDeclaration/okio/okio/-forwarding-timeout/await-signal.html
+$dokka.location:okio/ForwardingTimeout/cancel/#/PointingToDeclaration/okio/okio/-forwarding-timeout/cancel.html
 $dokka.location:okio/ForwardingTimeout/clearDeadline/#/PointingToDeclaration/okio/okio/-forwarding-timeout/clear-deadline.html
 $dokka.location:okio/ForwardingTimeout/clearTimeout/#/PointingToDeclaration/okio/okio/-forwarding-timeout/clear-timeout.html
 $dokka.location:okio/ForwardingTimeout/deadlineNanoTime/#/PointingToDeclaration/okio/okio/-forwarding-timeout/deadline-nano-time.html
@@ -415,6 +434,7 @@ $dokka.location:okio/ForwardingTimeout/setDelegate/#okio.Timeout/PointingToDecla
 $dokka.location:okio/ForwardingTimeout/throwIfReached/#/PointingToDeclaration/okio/okio/-forwarding-timeout/throw-if-reached.html
 $dokka.location:okio/ForwardingTimeout/timeout/#kotlin.Long#java.util.concurrent.TimeUnit/PointingToDeclaration/okio/okio/-forwarding-timeout/timeout.html
 $dokka.location:okio/ForwardingTimeout/timeoutNanos/#/PointingToDeclaration/okio/okio/-forwarding-timeout/timeout-nanos.html
+$dokka.location:okio/ForwardingTimeout/waitUntilNotified/#kotlin.Any/PointingToDeclaration/okio/okio/-forwarding-timeout/wait-until-notified.html
 $dokka.location:okio/GzipSink///PointingToDeclaration/okio/okio/-gzip-sink/index.html
 $dokka.location:okio/GzipSink/GzipSink/#okio.Sink/PointingToDeclaration/okio/okio/-gzip-sink/-gzip-sink.html
 $dokka.location:okio/GzipSink/close/#/PointingToDeclaration/okio/okio/-gzip-sink/close.html
@@ -440,7 +460,7 @@ $dokka.location:okio/HashingSink/close/#/PointingToDeclaration/okio/okio/-hashi
 $dokka.location:okio/HashingSink/flush/#/PointingToDeclaration/okio/okio/-hashing-sink/flush.html
 $dokka.location:okio/HashingSink/hash/#/PointingToDeclaration/okio/okio/-hashing-sink/hash.html
 $dokka.location:okio/HashingSink/timeout/#/PointingToDeclaration/okio/okio/-hashing-sink/timeout.html
-$dokka.location:okio/HashingSink/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-hashing-sink/[non-jvm]write.html
+$dokka.location:okio/HashingSink/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-hashing-sink/write.html
 $dokka.location:okio/HashingSource.Companion///PointingToDeclaration/okio/okio/-hashing-source/-companion/index.html
 $dokka.location:okio/HashingSource.Companion/hmacSha1/#okio.Source#okio.ByteString/PointingToDeclaration/okio/okio/-hashing-source/-companion/hmac-sha1.html
 $dokka.location:okio/HashingSource.Companion/hmacSha256/#okio.Source#okio.ByteString/PointingToDeclaration/okio/okio/-hashing-source/-companion/hmac-sha256.html
@@ -452,13 +472,20 @@ $dokka.location:okio/HashingSource.Companion/sha512/#okio.Source/PointingToDecla
 $dokka.location:okio/HashingSource///PointingToDeclaration/okio/okio/-hashing-source/index.html
 $dokka.location:okio/HashingSource/close/#/PointingToDeclaration/okio/okio/-hashing-source/close.html
 $dokka.location:okio/HashingSource/hash/#/PointingToDeclaration/okio/okio/-hashing-source/hash.html
-$dokka.location:okio/HashingSource/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-hashing-source/[non-jvm]read.html
+$dokka.location:okio/HashingSource/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-hashing-source/read.html
 $dokka.location:okio/HashingSource/timeout/#/PointingToDeclaration/okio/okio/-hashing-source/timeout.html
 $dokka.location:okio/IOException///PointingToDeclaration/okio/okio/-i-o-exception/index.html
+$dokka.location:okio/IOException/IOException/#/PointingToDeclaration/okio/okio/-i-o-exception/-i-o-exception.html
 $dokka.location:okio/IOException/IOException/#kotlin.String?#kotlin.Throwable?/PointingToDeclaration/okio/okio/-i-o-exception/-i-o-exception.html
 $dokka.location:okio/IOException/IOException/#kotlin.String?/PointingToDeclaration/okio/okio/-i-o-exception/-i-o-exception.html
+$dokka.location:okio/Inflater///PointingToDeclaration/okio/okio/-inflater/index.html
+$dokka.location:okio/Inflater/Inflater/#/PointingToDeclaration/okio/okio/-inflater/-inflater.html
+$dokka.location:okio/Inflater/Inflater/#kotlin.Boolean/PointingToDeclaration/okio/okio/-inflater/-inflater.html
+$dokka.location:okio/Inflater/end/#/PointingToDeclaration/okio/okio/-inflater/end.html
+$dokka.location:okio/Inflater/getBytesWritten/#/PointingToDeclaration/okio/okio/-inflater/get-bytes-written.html
 $dokka.location:okio/InflaterSource///PointingToDeclaration/okio/okio/-inflater-source/index.html
 $dokka.location:okio/InflaterSource/InflaterSource/#okio.Source#java.util.zip.Inflater/PointingToDeclaration/okio/okio/-inflater-source/-inflater-source.html
+$dokka.location:okio/InflaterSource/InflaterSource/#okio.Source#okio.Inflater/PointingToDeclaration/okio/okio/-inflater-source/-inflater-source.html
 $dokka.location:okio/InflaterSource/close/#/PointingToDeclaration/okio/okio/-inflater-source/close.html
 $dokka.location:okio/InflaterSource/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-inflater-source/read.html
 $dokka.location:okio/InflaterSource/readOrInflate/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-inflater-source/read-or-inflate.html
@@ -518,6 +545,10 @@ $dokka.location:okio/Sink/close/#/PointingToDeclaration/okio/okio/-sink/close.h
 $dokka.location:okio/Sink/flush/#/PointingToDeclaration/okio/okio/-sink/flush.html
 $dokka.location:okio/Sink/timeout/#/PointingToDeclaration/okio/okio/-sink/timeout.html
 $dokka.location:okio/Sink/write/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-sink/write.html
+$dokka.location:okio/Socket///PointingToDeclaration/okio/okio/-socket/index.html
+$dokka.location:okio/Socket/cancel/#/PointingToDeclaration/okio/okio/-socket/cancel.html
+$dokka.location:okio/Socket/sink/#/PointingToDeclaration/okio/okio/-socket/sink.html
+$dokka.location:okio/Socket/source/#/PointingToDeclaration/okio/okio/-socket/source.html
 $dokka.location:okio/Source///PointingToDeclaration/okio/okio/-source/index.html
 $dokka.location:okio/Source/close/#/PointingToDeclaration/okio/okio/-source/close.html
 $dokka.location:okio/Source/read/#okio.Buffer#kotlin.Long/PointingToDeclaration/okio/okio/-source/read.html
@@ -532,9 +563,12 @@ $dokka.location:okio/Throttler/source/#okio.Source/PointingToDeclaration/okio/o
 $dokka.location:okio/Timeout.Companion///PointingToDeclaration/okio/okio/-timeout/-companion/index.html
 $dokka.location:okio/Timeout.Companion/NONE/#/PointingToDeclaration/okio/okio/-timeout/-companion/-n-o-n-e.html
 $dokka.location:okio/Timeout.Companion/minTimeout/#kotlin.Long#kotlin.Long/PointingToDeclaration/okio/okio/-timeout/-companion/min-timeout.html
+$dokka.location:okio/Timeout.Companion/timeout/okio.Timeout#kotlin.Long#kotlin.time.DurationUnit/PointingToDeclaration/okio/okio/-timeout/-companion/timeout.html
+$dokka.location:okio/Timeout.Companion/timeout/okio.Timeout#kotlin.time.Duration/PointingToDeclaration/okio/okio/-timeout/-companion/timeout.html
 $dokka.location:okio/Timeout///PointingToDeclaration/okio/okio/-timeout/index.html
 $dokka.location:okio/Timeout/Timeout/#/PointingToDeclaration/okio/okio/-timeout/-timeout.html
 $dokka.location:okio/Timeout/awaitSignal/#java.util.concurrent.locks.Condition/PointingToDeclaration/okio/okio/-timeout/await-signal.html
+$dokka.location:okio/Timeout/cancel/#/PointingToDeclaration/okio/okio/-timeout/cancel.html
 $dokka.location:okio/Timeout/clearDeadline/#/PointingToDeclaration/okio/okio/-timeout/clear-deadline.html
 $dokka.location:okio/Timeout/clearTimeout/#/PointingToDeclaration/okio/okio/-timeout/clear-timeout.html
 $dokka.location:okio/Timeout/deadline/#kotlin.Long#java.util.concurrent.TimeUnit/PointingToDeclaration/okio/okio/-timeout/deadline.html
@@ -546,5 +580,10 @@ $dokka.location:okio/Timeout/throwIfReached/#/PointingToDeclaration/okio/okio/-
 $dokka.location:okio/Timeout/timeout/#kotlin.Long#java.util.concurrent.TimeUnit/PointingToDeclaration/okio/okio/-timeout/timeout.html
 $dokka.location:okio/Timeout/timeoutNanos/#/PointingToDeclaration/okio/okio/-timeout/timeout-nanos.html
 $dokka.location:okio/Timeout/waitUntilNotified/#kotlin.Any/PointingToDeclaration/okio/okio/-timeout/wait-until-notified.html
+$dokka.location:okio/TypedOptions.Companion///PointingToDeclaration/okio/okio/-typed-options/-companion/index.html
+$dokka.location:okio/TypedOptions.Companion/of/#kotlin.collections.Iterable[TypeParam(bounds=[kotlin.Any])]#kotlin.Function1[TypeParam(bounds=[kotlin.Any]),okio.ByteString]/PointingToDeclaration/okio/okio/-typed-options/-companion/of.html
+$dokka.location:okio/TypedOptions///PointingToDeclaration/okio/okio/-typed-options/index.html
+$dokka.location:okio/TypedOptions/TypedOptions/#kotlin.collections.List[TypeParam(bounds=[kotlin.Any])]#okio.Options/PointingToDeclaration/okio/okio/-typed-options/-typed-options.html
+$dokka.location:okio/TypedOptions/get/#kotlin.Int/PointingToDeclaration/okio/okio/-typed-options/get.html
+$dokka.location:okio/TypedOptions/size/#/PointingToDeclaration/okio/okio/-typed-options/size.html
 okio
-
diff --git a/formats/json/build.gradle.kts b/formats/json/build.gradle.kts
index db48d95564..2ef589ac19 100644
--- a/formats/json/build.gradle.kts
+++ b/formats/json/build.gradle.kts
@@ -52,11 +52,4 @@ kotlin {
     }
 }
 
-// This task should be disabled because of no need to build and publish intermediate JsWasm sourceset
-tasks.whenTaskAdded {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}
-
 configureJava9ModuleInfo()
diff --git a/gradle.properties b/gradle.properties
index deb1585fa6..9729429e99 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,6 @@ org.gradle.kotlin.dsl.allWarningsAsErrors=true
 kotlin.native.distribution.type=prebuilt
 
 org.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true