From 94c636adc3a1929a46630127f5d144ad1317f268 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Sat, 9 Jun 2018 20:34:11 +0300
Subject: [PATCH] Build: Fix usage of `jvmArgs` which became nullable

---
 idea/build.gradle.kts      |  3 +--
 idea/build.gradle.kts.173  | 13 ++++++++-----
 idea/build.gradle.kts.as31 | 13 ++++++++-----
 idea/build.gradle.kts.as32 | 13 ++++++++-----
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 1f2dfa99789..fc63ba1ac0a 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -42,7 +42,6 @@ dependencies {
 
     compileOnly(project(":kotlin-daemon-client"))
 
-
     compileOnly(intellijDep())
     compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
     compileOnly(intellijPluginDep("IntelliLang"))
@@ -152,7 +151,7 @@ projectTest(taskName = "performanceTest") {
     classpath = performanceTest.runtimeClasspath
     workingDir = rootDir
 
-    jvmArgs.removeAll { it.startsWith("-Xmx") }
+    jvmArgs?.removeAll { it.startsWith("-Xmx") }
 
     maxHeapSize = "3g"
     jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50")
diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173
index 616a46a00cd..9a340101f00 100644
--- a/idea/build.gradle.kts.173
+++ b/idea/build.gradle.kts.173
@@ -101,16 +101,19 @@ dependencies {
 sourceSets {
     "main" {
         projectDefault()
-        java.srcDirs("idea-completion/src",
-                     "idea-live-templates/src",
-                     "idea-repl/src")
+        java.srcDirs(
+            "idea-completion/src",
+            "idea-live-templates/src",
+            "idea-repl/src"
+        )
         resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
     }
     "test" {
         projectDefault()
         java.srcDirs(
-                     "idea-completion/tests",
-                     "idea-live-templates/tests")
+            "idea-completion/tests",
+            "idea-live-templates/tests"
+        )
     }
 }
 
diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31
index 5bb59e5efe5..0bec956a1ae 100644
--- a/idea/build.gradle.kts.as31
+++ b/idea/build.gradle.kts.as31
@@ -102,16 +102,19 @@ dependencies {
 sourceSets {
     "main" {
         projectDefault()
-        java.srcDirs("idea-completion/src",
-                     "idea-live-templates/src",
-                     "idea-repl/src")
+        java.srcDirs(
+            "idea-completion/src",
+            "idea-live-templates/src",
+            "idea-repl/src"
+        )
         resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
     }
     "test" {
         projectDefault()
         java.srcDirs(
-                     "idea-completion/tests",
-                     "idea-live-templates/tests")
+            "idea-completion/tests",
+            "idea-live-templates/tests"
+        )
     }
 }
 
diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32
index 5bb59e5efe5..0bec956a1ae 100644
--- a/idea/build.gradle.kts.as32
+++ b/idea/build.gradle.kts.as32
@@ -102,16 +102,19 @@ dependencies {
 sourceSets {
     "main" {
         projectDefault()
-        java.srcDirs("idea-completion/src",
-                     "idea-live-templates/src",
-                     "idea-repl/src")
+        java.srcDirs(
+            "idea-completion/src",
+            "idea-live-templates/src",
+            "idea-repl/src"
+        )
         resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
     }
     "test" {
         projectDefault()
         java.srcDirs(
-                     "idea-completion/tests",
-                     "idea-live-templates/tests")
+            "idea-completion/tests",
+            "idea-live-templates/tests"
+        )
     }
 }