aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndrzej Ratajczak <andrzej.ratajczak98@gmail.com>2020-05-28 16:04:20 +0200
committerPaweł Marks <pmarks@virtuslab.com>2020-06-12 14:15:24 +0200
commitd7be30c841cb925fd0d6322ccdd9877169730b92 (patch)
tree0cc39a4046af6ea203d516c937d26eaf16ef53da /core
parentcacc5ec47759c9ea2b8edeec6b39d8d16e6c8860 (diff)
downloaddokka-d7be30c841cb925fd0d6322ccdd9877169730b92.tar.gz
dokka-d7be30c841cb925fd0d6322ccdd9877169730b92.tar.bz2
dokka-d7be30c841cb925fd0d6322ccdd9877169730b92.zip
Add platform dependent annotations
Diffstat (limited to 'core')
-rw-r--r--core/src/main/kotlin/model/aditionalExtras.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index 1023545d..fcf1efa6 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -19,10 +19,10 @@ class AdditionalModifiers(val content: Set<ExtraModifiers>) : ExtraProperty<Docu
override val key: ExtraProperty.Key<Documentable, *> = AdditionalModifiers
}
-class Annotations(val content: List<Annotation>) : ExtraProperty<Documentable> {
+class Annotations(val content: SourceSetDependent<List<Annotation>>) : ExtraProperty<Documentable> {
companion object : ExtraProperty.Key<Documentable, Annotations> {
override fun mergeStrategyFor(left: Annotations, right: Annotations): MergeStrategy<Documentable> =
- MergeStrategy.Replace(Annotations((left.content + right.content).distinct()))
+ MergeStrategy.Replace(Annotations(left.content + right.content))
}
override val key: ExtraProperty.Key<Documentable, *> = Annotations