diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-06-25 17:40:12 +0200 |
|---|---|---|
| committer | Paweł Marks <pmarks@virtuslab.com> | 2020-06-25 20:31:42 +0200 |
| commit | 19996f2e89baf7bdeb83ec709400980721d189ed (patch) | |
| tree | 265a2d7b577756f25e5023e25aa25bb1520247bb | |
| parent | 72069ee58cf17e41183e9fbc8f278acc4e9a1699 (diff) | |
| download | dokka-19996f2e89baf7bdeb83ec709400980721d189ed.tar.gz dokka-19996f2e89baf7bdeb83ec709400980721d189ed.tar.bz2 dokka-19996f2e89baf7bdeb83ec709400980721d189ed.zip | |
Silence for now dependency to coroutines because it was breaking some tests
| -rw-r--r-- | plugins/base/build.gradle.kts | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts index b94a8ed3..d90385b5 100644 --- a/plugins/base/build.gradle.kts +++ b/plugins/base/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { val coroutines_version: String by project - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") + // implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") // TODO: Enable this dependency after update to 1.4-M3 api(project(":kotlin-analysis")) implementation("org.jsoup:jsoup:1.12.1") diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index ab3fb70c..42db9a1d 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -1,6 +1,5 @@ package org.jetbrains.dokka.base.translators.documentables -import org.jetbrains.dokka.DokkaConfiguration import org.jetbrains.dokka.base.signatures.SignatureProvider import org.jetbrains.dokka.base.transformers.documentables.CallableExtensions import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo @@ -14,7 +13,6 @@ import org.jetbrains.dokka.model.properties.WithExtraProperties import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.utilities.DokkaLogger import org.jetbrains.kotlin.utils.addToStdlib.safeAs -import javax.print.Doc import kotlin.reflect.KClass import kotlin.reflect.full.isSubclassOf import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet @@ -182,10 +180,9 @@ open class DefaultPageCreator( } protected open fun contentForClasslike(c: DClasslike) = contentBuilder.contentFor(c) { - val sourceSets = c.sourceSets.toSet() group(kind = ContentKind.Cover) { cover(c.name.orEmpty()) - sourceSetDependentHint(c.dri, sourceSets) { + sourceSetDependentHint(c.dri, c.sourceSets) { +contentForDescription(c) +buildSignature(c) } @@ -199,7 +196,7 @@ open class DefaultPageCreator( 2, ContentKind.Constructors, c.constructors.filter { it.extra[PrimaryConstructorExtra] == null }, - sourceSets, + c.sourceSets, extra = PropertyContainer.empty<ContentNode>() + SimpleAttr.header("Constructors") ) { link(it.name, it.dri, kind = ContentKind.Main) |