From bd57faba6f4638e97b1c361c62f38fe1af24a054 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 6 Dec 2016 16:04:41 +0300 Subject: [PATCH] gradle: pass platform version info to gradle daemon during import --- .../gradle/service/project/GradleProjectResolver.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java index b6f871d2cfbf..c3426250604e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java @@ -17,6 +17,8 @@ package org.jetbrains.plugins.gradle.service.project; import com.intellij.execution.configurations.ParametersList; import com.intellij.externalSystem.JavaProjectData; +import com.intellij.openapi.application.ex.ApplicationInfoEx; +import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.externalSystem.model.DataNode; import com.intellij.openapi.externalSystem.model.ExternalSystemException; @@ -164,6 +166,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver commandLineArgs = ContainerUtil.newArrayList(); final Set toolingExtensionClasses = ContainerUtil.newHashSet(); + commandLineArgs.add("-Didea.version=" + getIdeaVersion()); if(resolverCtx.isPreviewMode()){ commandLineArgs.add("-Didea.isPreviewMode=true"); final Set previewLightWeightToolingModels = ContainerUtil.set(ExternalProjectPreview.class, GradleBuild.class); @@ -840,4 +843,10 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver