From cdf5323f8cc76b36ccc692334712c1dc48c33fc2 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Thu, 13 Feb 2020 10:12:53 +0300
Subject: [PATCH] Disable NewInference for stdlib tests

 There is one failing test namely `ValByMapExtensionsTest.doTest`, which
 is quite questionable because its checks the use of out projection and
 Exact annotation (see KT-18789)
---
 libraries/stdlib/common/build.gradle    | 3 ++-
 libraries/stdlib/jdk7/build.gradle      | 3 ++-
 libraries/stdlib/jdk8/build.gradle      | 3 ++-
 libraries/stdlib/js-ir/build.gradle.kts | 3 ++-
 libraries/stdlib/js-v1/build.gradle     | 3 ++-
 libraries/stdlib/jvm/build.gradle       | 3 ++-
 libraries/stdlib/samples/build.gradle   | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index 991d675861d..4e00b3f4b49 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -58,7 +58,8 @@ compileTestKotlinCommon {
         freeCompilerArgs += [
                 "-Xuse-experimental=kotlin.Experimental",
                 "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-                "-Xuse-experimental=kotlin.ExperimentalStdlibApi"
+                "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+                "-XXLanguage:-NewInference"
         ]
     }
 }
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 25252395f4f..dfab83ca600 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -94,7 +94,8 @@ compileTestKotlin {
             "-Xmulti-platform",
             "-Xuse-experimental=kotlin.Experimental",
             "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-            "-Xuse-experimental=kotlin.ExperimentalStdlibApi"
+            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+            "-XXLanguage:-NewInference"
     ]
 }
 
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index fc7a430c5db..8ac6cc1bf4a 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -88,7 +88,8 @@ compileTestKotlin {
             "-Xmulti-platform",
             "-Xuse-experimental=kotlin.Experimental",
             "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-            "-Xuse-experimental=kotlin.ExperimentalStdlibApi"
+            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+            "-XXLanguage:-NewInference"
     ]
 }
 
diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts
index dc8c6a4d383..d021882d30e 100644
--- a/libraries/stdlib/js-ir/build.gradle.kts
+++ b/libraries/stdlib/js-ir/build.gradle.kts
@@ -270,7 +270,8 @@ fun JavaExec.buildJs(sources: List<String>, dependencies: List<String>, outPath:
          "-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
          "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
          "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
-         "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes"
+         "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
+         "-XXLanguage:-NewInference"
      )
     args = allArgs
 
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 771fec4ee43..45ffb9c6b19 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -155,7 +155,8 @@ compileTestKotlin2Js {
         freeCompilerArgs += [
             "-Xuse-experimental=kotlin.Experimental",
             "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-            "-Xuse-experimental=kotlin.ExperimentalStdlibApi"
+            "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+            "-XXLanguage:-NewInference"
         ]
     }
 }
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index aeaf214c380..687a280b026 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -142,7 +142,8 @@ compileTestKotlin {
         freeCompilerArgs += [
                 "-Xuse-experimental=kotlin.Experimental",
                 "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-                "-Xuse-experimental=kotlin.ExperimentalStdlibApi"
+                "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
+                "-XXLanguage:-NewInference"
         ]
     }
 }
diff --git a/libraries/stdlib/samples/build.gradle b/libraries/stdlib/samples/build.gradle
index 0ce806d3947..6ca1ecfcab3 100644
--- a/libraries/stdlib/samples/build.gradle
+++ b/libraries/stdlib/samples/build.gradle
@@ -15,7 +15,8 @@ compileTestKotlin {
         freeCompilerArgs = [
                 "-Xuse-experimental=kotlin.ExperimentalStdlibApi",
                 "-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
-                "-Xuse-experimental=kotlin.time.ExperimentalTime"
+                "-Xuse-experimental=kotlin.time.ExperimentalTime",
+                "-XXLanguage:-NewInference"
         ]
     }
 }