aboutsummaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/kotlin/DokkaGenerator.kt2
-rw-r--r--core/src/main/kotlin/model/documentableProperties.kt4
-rw-r--r--core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt2
3 files changed, 6 insertions, 2 deletions
diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt
index 671d0725..6f42b259 100644
--- a/core/src/main/kotlin/DokkaGenerator.kt
+++ b/core/src/main/kotlin/DokkaGenerator.kt
@@ -85,7 +85,7 @@ class DokkaGenerator(
fun mergeDocumentationModels(
modulesFromPlatforms: List<DModule>,
context: DokkaContext
- ) = context.single(CoreExtensions.documentableMerger).invoke(modulesFromPlatforms, context)
+ ) = context.single(CoreExtensions.documentableMerger).invoke(modulesFromPlatforms)
fun transformDocumentationModelAfterMerge(
documentationModel: DModule,
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt
index 4eb36599..823b88a0 100644
--- a/core/src/main/kotlin/model/documentableProperties.kt
+++ b/core/src/main/kotlin/model/documentableProperties.kt
@@ -24,4 +24,8 @@ data class ImplementedInterfaces(val interfaces: SourceSetDependent<List<TypeCon
}
override val key: ExtraProperty.Key<Documentable, *> = ImplementedInterfaces
+}
+
+object IsExpectActual: ExtraProperty<WithExpectActual>, ExtraProperty.Key<WithExpectActual, IsExpectActual> {
+ override val key: ExtraProperty.Key<WithExpectActual, IsExpectActual> = this
} \ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
index c8ae9c02..81c1f470 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
@@ -4,5 +4,5 @@ import org.jetbrains.dokka.model.DModule
import org.jetbrains.dokka.plugability.DokkaContext
interface DocumentableMerger {
- operator fun invoke(modules: Collection<DModule>, context: DokkaContext): DModule
+ operator fun invoke(modules: Collection<DModule>): DModule
} \ No newline at end of file