aboutsummaryrefslogtreecommitdiff
path: root/runners/gradle-plugin
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2019-09-11 16:53:54 +0200
committerKamil Doległo <kamilok1965@interia.pl>2019-10-10 12:26:46 +0200
commit47b825f5ce812e2563c2e613ba39dca0d69516d1 (patch)
tree1ad02655250c345a73cadb0fcf0ecf543a2b8bbc /runners/gradle-plugin
parentf4920fc9d067e59a5d843a185e07c5d321c91c6d (diff)
downloaddokka-47b825f5ce812e2563c2e613ba39dca0d69516d1.tar.gz
dokka-47b825f5ce812e2563c2e613ba39dca0d69516d1.tar.bz2
dokka-47b825f5ce812e2563c2e613ba39dca0d69516d1.zip
Bump Gradle to 4.10.3
Diffstat (limited to 'runners/gradle-plugin')
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt4
1 files changed, 1 insertions, 3 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 c66998d9..93139e27 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
@@ -13,14 +13,12 @@ import org.gradle.api.plugins.JavaPluginConvention
import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.dokka.ReflectDsl
-import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import java.io.File
import java.io.Serializable
@@ -94,7 +92,7 @@ class ConfigurationExtractor(private val project: Project) {
when (e){
is UnknownDomainObjectException, is NoClassDefFoundError, is ClassNotFoundException ->
project.extensions.getByType(KotlinMultiplatformExtension::class.java).targets
- .firstNotNullResult { target -> target.compilations.find { it.compileKotlinTask == task } }
+ .flatMap { it.compilations }.firstOrNull { it.compileKotlinTask == task }
else -> throw e
}
}.let { PlatformData(task.name, getClasspath(it), getSourceSet(it), it?.platformType?.toString() ?: "") }