From 0b98fd484f8d5b3ad9715d5d59d56ce9b436793c Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Tue, 3 Mar 2020 22:25:35 +0300
Subject: [PATCH] ~ Fix issues

---
 gradle.properties                      | 1 +
 gradle/compile-js-multiplatform.gradle | 7 -------
 js/example-frontend-js/build.gradle    | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5a31c4c955..116187a874 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,4 +46,5 @@ kotlin.native.ignoreDisabledTargets=true
 jekyll_version=4.0
 
 # JS IR baceknd sometimes crashes with out-of-memory
+# TODO: Remove once KT-37187 is fixed
 org.gradle.jvmargs=-Xmx2g
\ No newline at end of file
diff --git a/gradle/compile-js-multiplatform.gradle b/gradle/compile-js-multiplatform.gradle
index 2457bd75a4..55f711a29f 100644
--- a/gradle/compile-js-multiplatform.gradle
+++ b/gradle/compile-js-multiplatform.gradle
@@ -47,13 +47,6 @@ compileTestKotlinJs {
     kotlinOptions.metaInfo = true
     kotlinOptions.sourceMap = true
     kotlinOptions.moduleKind = 'umd'
-    kotlinOptions.freeCompilerArgs += "-XXLanguage:-NewInference"
-}
-
-if (project.tasks.findByName('compileKotlinJsIr')) {
-    compileKotlinJsIr {
-        kotlinOptions.freeCompilerArgs += "-XXLanguage:-NewInference"
-    }
 }
 
 
diff --git a/js/example-frontend-js/build.gradle b/js/example-frontend-js/build.gradle
index c4e6b10cc7..dc4dfd2d9a 100644
--- a/js/example-frontend-js/build.gradle
+++ b/js/example-frontend-js/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-dce-js'
 apply from: rootProject.file('gradle/node-js.gradle')
 
 // Workaround resolving new Gradle metadata with kotlin2js
-// TODO: Remove once plugin is fixed
+// TODO: Remove once KT-37188 is fixed
 try {
     def jsCompilerType = Class.forName("org.jetbrains.kotlin.gradle.targets.js.JsCompilerType")
     def jsCompilerAttr = Attribute.of("org.jetbrains.kotlin.js.compiler", jsCompilerType)