diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-06-16 12:25:01 +0200 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@interia.pl> | 2020-06-16 12:25:01 +0200 |
| commit | 343eace38c4f26ced0de70b413174a2a77dbf5ec (patch) | |
| tree | 6013069531ce3d43f3aafa809a9ff18cb05f94fd | |
| parent | 9637ec0747815181d56fa53419d4f6c56705752b (diff) | |
| download | dokka-343eace38c4f26ced0de70b413174a2a77dbf5ec.tar.gz dokka-343eace38c4f26ced0de70b413174a2a77dbf5ec.tar.bz2 dokka-343eace38c4f26ced0de70b413174a2a77dbf5ec.zip | |
Fix sourceSetID creation
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt | 2 | ||||
| -rw-r--r-- | runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt index 31d1d241..bb26ceef 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt +++ b/plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt @@ -119,7 +119,7 @@ internal class ReportUndocumentedTransformer : DocumentableTransformer { configuration.sourceSetID == sourceSet.sourceSetID } if (passes.size > 1) - context.logger.error("Expected one passConfiguration with ID: ${sourceSet.sourceSetID} found: ${passes.size}") + context.logger.error("Expected one passConfiguration with ID: ${sourceSet.sourceSetID} found: ${passes.size} in [${passes.joinToString { it.moduleName }}]") return passes.first() } diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt index 2f821209..1759b6f3 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt @@ -273,7 +273,6 @@ open class DokkaTask : DefaultTask(), Configurable { autoConfig: PlatformData ) = userConfig.copy().apply { - sourceSetID = autoConfig.name ?: "" sourceRoots.addAll(userConfig.sourceRoots.union(autoConfig.sourceRoots.toSourceRoots()).distinct()) dependentSourceSets.addAll(userConfig.dependentSourceSets.union(autoConfig.dependentSourceSets).distinct()) classpath = userConfig.classpath.union(autoConfig.classpath.map { it.absolutePath }).distinct() |