Allow override gradle version for plugin tests
This commit is contained in:
committed by
Ilya Matveev
parent
47b8354d8b
commit
0cb3c71ed8
@@ -191,6 +191,9 @@ test {
|
|||||||
if (project.hasProperty("filter")) {
|
if (project.hasProperty("filter")) {
|
||||||
filter.includeTestsMatching project.property("filter")
|
filter.includeTestsMatching project.property("filter")
|
||||||
}
|
}
|
||||||
|
if (project.hasProperty("gradleVersion")) {
|
||||||
|
systemProperty("gradleVersion", project.property("gradleVersion"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
+8
-1
@@ -17,6 +17,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle.plugin.test
|
package org.jetbrains.kotlin.gradle.plugin.test
|
||||||
|
|
||||||
import org.gradle.testkit.runner.GradleRunner
|
import org.gradle.testkit.runner.GradleRunner
|
||||||
|
import org.gradle.util.GradleVersion
|
||||||
import org.jetbrains.kotlin.konan.target.HostManager
|
import org.jetbrains.kotlin.konan.target.HostManager
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
@@ -49,6 +50,7 @@ class KonanProject {
|
|||||||
File konanBuildDir
|
File konanBuildDir
|
||||||
|
|
||||||
String konanHome
|
String konanHome
|
||||||
|
String gradleVersion
|
||||||
|
|
||||||
File buildFile
|
File buildFile
|
||||||
File propertiesFile
|
File propertiesFile
|
||||||
@@ -95,10 +97,15 @@ class KonanProject {
|
|||||||
}
|
}
|
||||||
// Escape windows path separator
|
// Escape windows path separator
|
||||||
this.konanHome = escapeBackSlashes(konanHomeDir.canonicalPath)
|
this.konanHome = escapeBackSlashes(konanHomeDir.canonicalPath)
|
||||||
|
this.gradleVersion = System.getProperty("gradleVersion") ?: GradleVersion.current().version
|
||||||
}
|
}
|
||||||
|
|
||||||
GradleRunner createRunner(boolean withDebug = true) {
|
GradleRunner createRunner(boolean withDebug = true) {
|
||||||
return GradleRunner.create().withProjectDir(projectDir).withPluginClasspath().withDebug(withDebug)
|
return GradleRunner.create()
|
||||||
|
.withProjectDir(projectDir)
|
||||||
|
.withPluginClasspath()
|
||||||
|
.withDebug(withDebug)
|
||||||
|
.withGradleVersion(gradleVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Creates a subdirectory specified by the given path. */
|
/** Creates a subdirectory specified by the given path. */
|
||||||
|
|||||||
Reference in New Issue
Block a user