From eae1ce49d18c2978b49166ea502bf2c109a85504 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Sat, 18 Jul 2020 12:18:59 +0200
Subject: Simplify Dokka Gradle Plugin

---
 .../documentables/ModuleAndPackageDocumentationTransformer.kt       | 6 +++---
 .../documentables/SuppressedDocumentableFilterTransformer.kt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/base/src/main/kotlin/transformers/documentables')

diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
index 4a98a5e0..71824922 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
@@ -22,9 +22,9 @@ internal class ModuleAndPackageDocumentationTransformer(
 
         val modulesAndPackagesDocumentation =
             context.configuration.sourceSets
-                .map {
-                    Pair(it.moduleDisplayName, it) to
-                            it.includes.map { Paths.get(it) }
+                .map { sourceSet ->
+                    Pair(sourceSet.moduleDisplayName, sourceSet) to
+                            sourceSet.includes.map { it.toPath() }
                                 .also {
                                     it.forEach {
                                         if (Files.notExists(it))
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/SuppressedDocumentableFilterTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/SuppressedDocumentableFilterTransformer.kt
index 79feb832..7febabbb 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/SuppressedDocumentableFilterTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/SuppressedDocumentableFilterTransformer.kt
@@ -45,7 +45,7 @@ class SuppressedDocumentableFilterTransformer(val context: DokkaContext) : PreMe
         if (documentable !is WithExpectActual) return false
         val sourceFile = File(source(documentable).path).absoluteFile
         return sourceSet(documentable).suppressedFiles.any { suppressedFile ->
-            sourceFile.startsWith(File(suppressedFile).absoluteFile)
+            sourceFile.startsWith(suppressedFile.absoluteFile)
         }
     }
 }
-- 
cgit