From d7be30c841cb925fd0d6322ccdd9877169730b92 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 28 May 2020 16:04:20 +0200 Subject: Add platform dependent annotations --- core/src/main/kotlin/model/aditionalExtras.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/main/kotlin') 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) : ExtraProperty = AdditionalModifiers } -class Annotations(val content: List) : ExtraProperty { +class Annotations(val content: SourceSetDependent>) : ExtraProperty { companion object : ExtraProperty.Key { override fun mergeStrategyFor(left: Annotations, right: Annotations): MergeStrategy = - MergeStrategy.Replace(Annotations((left.content + right.content).distinct())) + MergeStrategy.Replace(Annotations(left.content + right.content)) } override val key: ExtraProperty.Key = Annotations -- cgit