From 6b85bb2ec2764a2c8b14717ef8e013a0f3c6e99f Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Tue, 19 May 2020 19:02:58 +0200 Subject: Merging of platform dependent hints in sourceset tree --- core/src/main/kotlin/configuration.kt | 1 + core/src/main/kotlin/defaultConfiguration.kt | 1 + core/src/main/kotlin/model/SourceSetData.kt | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'core/src') diff --git a/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt index 88924924..e74d10d7 100644 --- a/core/src/main/kotlin/configuration.kt +++ b/core/src/main/kotlin/configuration.kt @@ -40,6 +40,7 @@ interface DokkaConfiguration { val classpath: List val sourceRoots: List val dependentSourceRoots: List + val dependentSourceSets: List val samples: List val includes: List val includeNonPublic: Boolean diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt index 08f70b45..9f36606a 100644 --- a/core/src/main/kotlin/defaultConfiguration.kt +++ b/core/src/main/kotlin/defaultConfiguration.kt @@ -20,6 +20,7 @@ data class PassConfigurationImpl ( override val classpath: List, override val sourceRoots: List, override val dependentSourceRoots: List, + override val dependentSourceSets: List, override val samples: List, override val includes: List, override val includeNonPublic: Boolean, diff --git a/core/src/main/kotlin/model/SourceSetData.kt b/core/src/main/kotlin/model/SourceSetData.kt index 8f67f272..964d5ca9 100644 --- a/core/src/main/kotlin/model/SourceSetData.kt +++ b/core/src/main/kotlin/model/SourceSetData.kt @@ -8,15 +8,19 @@ data class SourceSetData( val moduleName: String, val sourceSetName: String, val platform: Platform, - val sourceRoots: List = emptyList() + val sourceRoots: List = emptyList(), + val dependentSourceSets: List = emptyList() ) class SourceSetCache { private val sourceSets = HashMap() + val allSourceSets: List + get() = sourceSets.values.toList() + fun getSourceSet(pass: DokkaConfiguration.PassConfiguration) = sourceSets.getOrPut("${pass.moduleName}/${pass.sourceSetName}", - { SourceSetData(pass.moduleName, pass.sourceSetName, pass.analysisPlatform, pass.sourceRoots) } + { SourceSetData(pass.moduleName, pass.sourceSetName, pass.analysisPlatform, pass.sourceRoots, pass.dependentSourceSets) } ) } -- cgit