From a51ae33e4d2d9bffc9473ece24ac7cbc3c6903ed Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 1 Mar 2023 10:29:30 +0100 Subject: [PATCH] Build: Add `-Xmx3g` to `kotlin.daemon.jvmargs` in settings-conventions To avoid spawning multiple daemons `kotlin.daemon.jvmargs` should be the same as root gradle.properties and buildSrc #KTI-1142 --- buildSrc/gradle.properties | 2 +- gradle.properties | 3 +++ repo/gradle-settings-conventions/gradle.properties | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index cd5c260e18f..eb8ee72ddc5 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Duser.country=US -# Should be the same as in the main project to avoid spawning second daemon +# Should be the same as in the root gradle.properties to avoid spawning second daemon kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true cacheRedirectorEnabled=true diff --git a/gradle.properties b/gradle.properties index 53a6940a245..9ffe19b274f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,8 @@ org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true + +#!!! It should be uniform across the project to avoid multiple daemons spawning during the build, which often leads to OOM on build server kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true + systemProp.file.encoding=UTF-8 systemProp.user.country=US # Enable new incremental compiation diff --git a/repo/gradle-settings-conventions/gradle.properties b/repo/gradle-settings-conventions/gradle.properties index 67fdc69c1fc..7d0e0c48377 100644 --- a/repo/gradle-settings-conventions/gradle.properties +++ b/repo/gradle-settings-conventions/gradle.properties @@ -1,4 +1,5 @@ kotlin.build.gradlePlugin.version=0.0.39 kotlin.options.suppressFreeCompilerArgsModificationWarning=true cacheRedirectorEnabled=true -kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true +# Should be the same as in the root gradle.properties to avoid spawning second daemon +kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file