From 3b6de8b899a6c754816bf8e858e7bff390c61ec3 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Fri, 30 Sep 2022 18:19:21 +0200 Subject: [PATCH] [K/N][gradle][test] Fix repositories in the test and add another one --- .../native/NativeDownloadAndPlatformLibsIT.kt | 30 ++++++++++++++----- .../native-download-maven/build.gradle.kts | 2 ++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt index 30cef0440b6..de4a42c1eb8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt @@ -352,14 +352,7 @@ class NativeDownloadAndPlatformLibsIT : BaseGradleIT() { """.trimIndent() ) gradleBuildScript().let { - val text = it.readText() - .replaceFirst( - "mavenLocal()", - """ - mavenLocal() - maven("${mavenUrl()}") - """.trimIndent() - ) + val text = it.readText().replaceFirst("// ", "maven(\"${mavenUrl()}\")") it.writeText(text) } @@ -385,4 +378,25 @@ class NativeDownloadAndPlatformLibsIT : BaseGradleIT() { } } } + + @Test + fun `download from maven specified in the build and with parameter`() { + with(transformNativeTestProjectWithPluginDsl("native-download-maven")) { + gradleProperties().appendText( + """ + kotlin.native.distribution.mavenDownloadUrl=${mavenUrl()} + kotlin.native.distribution.downloadFromMaven=true + """.trimIndent() + ) + gradleBuildScript().let { + val text = it.readText().replaceFirst("// ", "maven(\"${mavenUrl()}\")") + it.writeText(text) + } + + build("assemble") { + assertSuccessful() + assertContains("Unpack Kotlin/Native compiler to ") + } + } + } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-download-maven/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-download-maven/build.gradle.kts index c42733437c0..0f9adcece6a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-download-maven/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-download-maven/build.gradle.kts @@ -5,6 +5,8 @@ plugins { } repositories { + // + mavenCentral() mavenLocal() }