Correctly setup maven local repository path and kotlin version for gradle integration tests
This commit is contained in:
committed by
Sergey Igushkin
parent
7af7696c44
commit
6a61d22ad3
@@ -69,6 +69,12 @@ tasks.withType(Test) {
|
|||||||
|
|
||||||
executable = "${JDK_18}/bin/java"
|
executable = "${JDK_18}/bin/java"
|
||||||
|
|
||||||
|
systemProperty("kotlinVersion", kotlinVersion)
|
||||||
|
def mavenLocalRepo = System.getProperty("maven.repo.local")
|
||||||
|
if (mavenLocalRepo != null) {
|
||||||
|
systemProperty("maven.repo.local", mavenLocalRepo)
|
||||||
|
}
|
||||||
|
|
||||||
testLogging {
|
testLogging {
|
||||||
// set options for log level LIFECYCLE
|
// set options for log level LIFECYCLE
|
||||||
events "passed", "skipped", "failed", "standardOut"
|
events "passed", "skipped", "failed", "standardOut"
|
||||||
|
|||||||
+3
@@ -442,6 +442,9 @@ abstract class BaseGradleIT {
|
|||||||
options.kotlinDaemonDebugPort?.let { port ->
|
options.kotlinDaemonDebugPort?.let { port ->
|
||||||
add("-Dkotlin.daemon.jvm.options=-agentlib:jdwp=transport=dt_socket\\,server=y\\,suspend=y\\,address=$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)
|
addAll(options.freeCommandLineArgs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2,4 +2,4 @@ package org.jetbrains.kotlin.gradle
|
|||||||
|
|
||||||
// constant is held in separate file intentionally for better discoverability
|
// 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)
|
// 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"
|
val KOTLIN_VERSION get() = System.getProperty("kotlinVersion") ?: error("Required to specify kotlinVersion system property for tests")
|
||||||
Reference in New Issue
Block a user