diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2019-07-03 11:45:00 +0200 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@interia.pl> | 2019-07-03 11:45:00 +0200 |
| commit | 42e5e47e2c8921596b7b5d5e4394e872f686b07d (patch) | |
| tree | f3aba4d7d3883a30a5ce3ee1e5c3a00c251920ca /runners/gradle-plugin | |
| parent | f55d000ac5f7609a6cc8472e315ae45d4cbcc77b (diff) | |
| download | dokka-42e5e47e2c8921596b7b5d5e4394e872f686b07d.tar.gz dokka-42e5e47e2c8921596b7b5d5e4394e872f686b07d.tar.bz2 dokka-42e5e47e2c8921596b7b5d5e4394e872f686b07d.zip | |
Fix bug with common platform sourceSets
Diffstat (limited to 'runners/gradle-plugin')
| -rw-r--r-- | runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt | 2 | ||||
| -rw-r--r-- | runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt index 491aaae0..ba931313 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt @@ -58,7 +58,7 @@ object ConfigurationExtractor { PlatformData(it.name, getClasspath(it), getSourceSet(it), it.platformType.toString()) } - return config + PlatformData("common", getSourceSet(commonTarget), getClasspath(commonTarget), "common") + return config + PlatformData("common", getClasspath(commonTarget), getSourceSet(commonTarget), "common") } fun extractFromKotlinTasks(kotlinTasks: List<Task>, project: Project): PlatformData? { 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 6e36fb68..6bad548a 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 @@ -255,7 +255,8 @@ open class DokkaTask : DefaultTask() { if (config.moduleName == "") { config.moduleName = moduleName } - config.classpath = (config.classpath as List<Any>).map { it.toString() } // Workaround for Groovy's GStringImpl + config.classpath = (config.classpath as List<Any>).map { it.toString() }.distinct() // Workaround for Groovy's GStringImpl + config.sourceRoots = config.sourceRoots.distinct().toMutableList() config.samples = config.samples.map { project.file(it).absolutePath } config.includes = config.includes.map { project.file(it).absolutePath } config.suppressedFiles += collectSuppressedFiles(config.sourceRoots) |