diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle index e13e1efbcac..6d3ca58a4b6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle @@ -69,6 +69,12 @@ tasks.withType(Test) { executable = "${JDK_18}/bin/java" + systemProperty("kotlinVersion", kotlinVersion) + def mavenLocalRepo = System.getProperty("maven.repo.local") + if (mavenLocalRepo != null) { + systemProperty("maven.repo.local", mavenLocalRepo) + } + testLogging { // set options for log level LIFECYCLE events "passed", "skipped", "failed", "standardOut" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 9da522f7baa..9ce6f76c2db 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -442,6 +442,9 @@ abstract class BaseGradleIT { options.kotlinDaemonDebugPort?.let { port -> add("-Dkotlin.daemon.jvm.options=-agentlib:jdwp=transport=dt_socket\\,server=y\\,suspend=y\\,address=$port") } + System.getProperty("maven.repo.local")?.let { + add("-Dmaven.repo.local=$it") // TODO: proper escaping + } addAll(options.freeCommandLineArgs) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt index 49ad9fb435d..c2a7f9c54bf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt @@ -2,4 +2,4 @@ package org.jetbrains.kotlin.gradle // constant is held in separate file intentionally for better discoverability // and to prevent vcs conflicts (its value is 1.1-* in master branch, 0.1-* in 1.0.x branches) -const val KOTLIN_VERSION = "1.1-SNAPSHOT" \ No newline at end of file +val KOTLIN_VERSION get() = System.getProperty("kotlinVersion") ?: error("Required to specify kotlinVersion system property for tests") \ No newline at end of file