gradle: pass platform version info to gradle daemon during import

This commit is contained in:
Vladislav.Soroka
2016-12-06 16:05:40 +03:00
parent ce16623f39
commit bd57faba6f
@@ -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<Grad
final List<String> commandLineArgs = ContainerUtil.newArrayList();
final Set<Class> toolingExtensionClasses = ContainerUtil.newHashSet();
commandLineArgs.add("-Didea.version=" + getIdeaVersion());
if(resolverCtx.isPreviewMode()){
commandLineArgs.add("-Didea.isPreviewMode=true");
final Set<Class> previewLightWeightToolingModels = ContainerUtil.set(ExternalProjectPreview.class, GradleBuild.class);
@@ -840,4 +843,10 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
return projectResolverChain;
}
private static String getIdeaVersion() {
ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance();
return appInfo.getMajorVersion() + "." + appInfo.getMinorVersion();
}
}