From 22064fd0059ac95ac6bac81769509549e5327382 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 26 Oct 2018 16:20:31 +0300 Subject: [PATCH] Choose Gradle version for Gradle model tests as for other tests --- .../kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 a0241ec21ca..da6aec3630c 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 @@ -285,11 +285,18 @@ abstract class BaseGradleIT { setupWorkingDir() } - val connection = GradleConnector.newConnector().forProjectDirectory(projectDir).connect() val options = defaultBuildOptions() val arguments = mutableListOf("-Pkotlin_version=${options.kotlinVersion}") options.androidGradlePluginVersion?.let { arguments.add("-Pandroid_tools_version=$it") } val env = createEnvironmentVariablesMap(options) + val wrapperVersion = chooseWrapperVersionOrFinishTest() + prepareWrapper(wrapperVersion, env) + + val connection = GradleConnector + .newConnector() + .useGradleVersion(wrapperVersion) + .forProjectDirectory(projectDir) + .connect() val model = connection.action(ModelFetcherBuildAction(modelType)).withArguments(arguments).setEnvironmentVariables(env).run() connection.close() return model