From 0cb3c71ed8fcbaab9bff55afa19203eb58f377d8 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 18 Feb 2019 16:37:52 +0300
Subject: [PATCH] Allow override gradle version for plugin tests

---
 tools/kotlin-native-gradle-plugin/build.gradle           | 3 +++
 .../kotlin/gradle/plugin/test/KonanProject.groovy        | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 00877fdf338..e9a49df9bad 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -191,6 +191,9 @@ test {
     if (project.hasProperty("filter")) {
         filter.includeTestsMatching project.property("filter")
     }
+    if (project.hasProperty("gradleVersion")) {
+        systemProperty("gradleVersion", project.property("gradleVersion"))
+    }
 }
 
 processResources {
diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
index 86f8cbace02..b6a26c79f78 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.gradle.plugin.test
 
 import org.gradle.testkit.runner.GradleRunner
+import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.konan.target.HostManager
 
 import java.nio.file.Files
@@ -49,6 +50,7 @@ class KonanProject {
     File konanBuildDir
 
     String konanHome
+    String gradleVersion
 
     File         buildFile
     File         propertiesFile
@@ -95,10 +97,15 @@ class KonanProject {
         }
         // Escape windows path separator
         this.konanHome = escapeBackSlashes(konanHomeDir.canonicalPath)
+        this.gradleVersion = System.getProperty("gradleVersion") ?: GradleVersion.current().version
     }
 
     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. */