Supports hacks for MPP documentation generation

Kotlin · Dec 22, 2017 · 4a425e2 · 4a425e2
1 parent dcaa940
commit 4a425e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
@@ -114,15 +114,15 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable {
 
 
         val javaRoots = classpath
-                .map {
+                .mapNotNull {
                     val rootFile = when {
                         it.extension == "jar" ->
-                            StandardFileSystems.jar().findFileByPath("${it.absolutePath}${URLUtil.JAR_SEPARATOR}")!!
+                            StandardFileSystems.jar().findFileByPath("${it.absolutePath}${URLUtil.JAR_SEPARATOR}")
                         else ->
-                            StandardFileSystems.local().findFileByPath(it.absolutePath)!!
+                            StandardFileSystems.local().findFileByPath(it.absolutePath)
                     }
 
-                    JavaRoot(rootFile, JavaRoot.RootType.BINARY)
+                    rootFile?.let { JavaRoot(it, JavaRoot.RootType.BINARY) }
                 }
 
         val resolverForProject = ResolverForProjectImpl(

diff --git a/runners/gradle-plugin/src/main/kotlin/main.kt b/runners/gradle-plugin/src/main/kotlin/main.kt
@@ -379,7 +379,7 @@ open class DokkaTask : DefaultTask() {
     }
 }
 
-class SourceRoot : DokkaConfiguration.SourceRoot {
+class SourceRoot : DokkaConfiguration.SourceRoot, Serializable {
     override var path: String = ""
         set(value) {
             field = File(value).absolutePath