From 52990c9eb1506a086c7560b440368444a2bf3fd0 Mon Sep 17 00:00:00 2001 From: Lucas Smaira Date: Fri, 27 Jul 2018 17:16:28 +0100 Subject: [PATCH] Set JAVA and ANDROID_HOME when fetching Gradle models In BaseGradleIT --- .../test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 3 ++- 1 file changed, 2 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 458231117b2..5fde68151ec 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 @@ -286,7 +286,8 @@ abstract class BaseGradleIT { val options = defaultBuildOptions() val arguments = mutableListOf("-Pkotlin_version=${options.kotlinVersion}") options.androidGradlePluginVersion?.let { arguments.add("-Pandroid_tools_version=$it") } - val model = connection.action(ModelFetcherBuildAction(modelType)).withArguments(arguments).run() + val env = createEnvironmentVariablesMap(options) + val model = connection.action(ModelFetcherBuildAction(modelType)).withArguments(arguments).setEnvironmentVariables(env).run() connection.close() return model }