Trim windows carrage return sign in importing includes

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
index a886494e..b1f50a32 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
@@ -41,7 +41,7 @@ internal class ModuleAndPackageDocumentationTransformer(val context: DokkaContex
                                         } // Matches space between Module/Package and fully qualified name
                                 }.groupBy({ it[0] }, {
                                     it[1].split(Regex("\n"), 2) // Matches new line after fully qualified name
-                                        .let { it[0] to it[1].trim() }
+                                        .let { it[0].trim() to it[1].trim() }
                                 }).mapValues {
                                     it.value.toMap()
                                 }
diff --git a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
index b18c3a5a..c34fa909 100644
--- a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
+++ b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
+import java.nio.file.Paths
 
 class LinkableContentTest : AbstractCoreTest() {
 
@@ -29,20 +30,20 @@ class LinkableContentTest : AbstractCoreTest() {
                     analysisPlatform = "js"
                     targets = listOf("js")
                     sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map {
-                        "$testDataDir/$it/kotlin"
+                        Paths.get("$testDataDir/$it/kotlin").toString()
                     }
                     sourceSetName = "js"
-                    includes = listOf("$includesDir/include2.md")
+                    includes = listOf(Paths.get("$includesDir/include2.md").toString())
                 }
                 pass {
                     moduleName = "example"
                     analysisPlatform = "jvm"
                     targets = listOf("jvm")
                     sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map {
-                        "$testDataDir/$it/kotlin"
+                        Paths.get("$testDataDir/$it/kotlin").toString()
                     }
                     sourceSetName = "jvm"
-                    includes = listOf("$includesDir/include1.md")
+                    includes = listOf(Paths.get("$includesDir/include1.md").toString())
                 }
             }
         }