From 88488f4dc910c8e51b7f8bd1ef11603a5b0b720e Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Thu, 6 Apr 2023 10:17:50 +0200 Subject: [PATCH] [Gradle, Test] Fix disable default publications test Windows has different line endings, so it is not possible to to seek multiline substrings. --- .../kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index 0d418413b2a..71034543d9f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -1173,7 +1173,8 @@ open class HierarchicalMppIT : KGPBaseTest() { | """.trimMargin() - if (expectedDependency !in pom) { + fun String.asOneLine() = lines().joinToString(" ") { it.trim() } + if (expectedDependency.asOneLine() !in pom.asOneLine()) { fail("Expected to find:\n$expectedDependency\nin pom file:\n$pom") } }