From 489b1a5708f2914cda3787e64f27c1a100132a6e Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 6 Mar 2018 16:25:32 +0300
Subject: [PATCH] [gradle-plugin] Run tools with -Xmx3G by default

---
 samples/gradle.properties                                    | 3 +--
 samples/gtk/build.gradle                                     | 5 ++++-
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt | 2 +-
 .../org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt    | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/samples/gradle.properties b/samples/gradle.properties
index 8f9c497b2ad..3be37412632 100644
--- a/samples/gradle.properties
+++ b/samples/gradle.properties
@@ -1,2 +1 @@
-konan.home=../../dist
-konan.jvmArgs=-Xmx3G
\ No newline at end of file
+konan.home=../../dist
\ No newline at end of file
diff --git a/samples/gtk/build.gradle b/samples/gtk/build.gradle
index 371d0b2d0dd..e702b8680b5 100644
--- a/samples/gtk/build.gradle
+++ b/samples/gtk/build.gradle
@@ -1,6 +1,9 @@
 apply plugin: 'konan'
 
-konan.targets = ['macbook', 'linux']
+konan {
+    targets = ['macbook', 'linux']
+    jvmArgs = ['-Xmx8g']
+}
 
 def includePrefixes = [ '/opt/local/include', '/usr/include', '/usr/local/include' ]
 
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
index f92a541ed53..22f016f6421 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
@@ -238,7 +238,7 @@ open class KonanExtension {
     var targets = mutableListOf("host")
     var languageVersion: String? = null
     var apiVersion: String? = null
-    val jvmArgs = mutableListOf<String>()
+    var jvmArgs = mutableListOf<String>()
 }
 
 class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderRegistry)
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt
index 7c368bdc516..4e0b40d530e 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanToolRunner.kt
@@ -53,6 +53,10 @@ internal abstract class KonanCliRunner(val toolName: String, val fullName: Strin
             "-ea",
             "-Dkonan.home=${project.konanHome}",
             "-Djava.library.path=${project.konanHome}/konan/nativelib").apply {
+        if (project.konanExtension.jvmArgs.none { it.startsWith("-Xmx") } &&
+            project.jvmArgs.none { it.startsWith("-Xmx") }) {
+            add("-Xmx3G")
+        }
         addAll(project.konanExtension.jvmArgs)
         addAll(project.jvmArgs)
     }