MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

gradle: do not merge jvm args with gradle JvmOptions#getAllJvmArgs

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-07-17 17:58:32 +03:00
parent 98403e3a85
commit 5265cb6911
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
+1 -13
View File
@@ -29,7 +29,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
import org.gradle.process.internal.JvmOptions;
import org.gradle.tooling.*;
import org.gradle.tooling.internal.consumer.DefaultExecutorServiceFactory;
import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
@@ -50,7 +49,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -134,12 +132,8 @@ public class GradleExecutionHelper {
jvmArgs.addAll(extraJvmArgs);
if (!jvmArgs.isEmpty()) {
BuildEnvironment buildEnvironment = getBuildEnvironment(connection);
Collection<String> merged =
buildEnvironment != null ? mergeJvmArgs(buildEnvironment.getJava().getJvmArguments(), jvmArgs) : jvmArgs;
// filter nulls and empty strings
List<String> filteredArgs = ContainerUtil.mapNotNull(merged, new Function<String, String>() {
List<String> filteredArgs = ContainerUtil.mapNotNull(jvmArgs, new Function<String, String>() {
@Override
public String fun(String s) {
return StringUtil.isEmpty(s) ? null : s;
@@ -290,12 +284,6 @@ public class GradleExecutionHelper {
}
}
private static List<String> mergeJvmArgs(Iterable<String> jvmArgs1, Iterable<String> jvmArgs2) {
JvmOptions jvmOptions = new JvmOptions(null);
jvmOptions.setAllJvmArgs(ContainerUtil.concat(jvmArgs1, jvmArgs2));
return jvmOptions.getAllJvmArgs();
}
/**
* Allows to retrieve gradle api connection to use for the given project.
*