From d9656a939bfbd2a2da7ec937df07d6142e60a76d Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sun, 20 May 2018 19:09:36 +0300
Subject: [PATCH] Do not produce libraries json declarations dump

It's no longer needed for checking binary compatibility.
Clean build of these libraries is no longer required too.

Cleanup build.gradle of binary-compatibility-validator.
---
 ..._binary_compatibility_validator__overwrite_results.xml | 3 ---
 libraries/reflect/api/build.gradle                        | 3 +--
 libraries/stdlib/jdk7/build.gradle                        | 1 -
 libraries/stdlib/jdk8/build.gradle                        | 1 -
 libraries/stdlib/jre7/build.gradle                        | 1 -
 libraries/stdlib/jre8/build.gradle                        | 1 -
 libraries/stdlib/jvm/build.gradle                         | 3 ---
 libraries/stdlib/runtime/build.gradle                     | 1 -
 .../tools/binary-compatibility-validator/build.gradle     | 8 +-------
 9 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
index 6108c0ebb1c..07f21b08958 100644
--- a/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
+++ b/.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml
@@ -10,9 +10,6 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":kotlin-runtime:clean" />
-          <option value=":kotlin-stdlib:clean" />
-          <option value=":kotlin-reflect:clean" />
           <option value=":tools:binary-compatibility-validator:cleanTest" />
           <option value=":tools:binary-compatibility-validator:test" />
         </list>
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index 930b398a089..3090d868520 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -29,8 +29,7 @@ compileKotlin {
         freeCompilerArgs = ["-version",
                             "-Xallow-kotlin-package",
                             "-Xnormalize-constructor-calls=enable",
-                            "-module-name", "kotlin-reflection",
-                            "-Xdump-declarations-to=${buildDir}/reflect-declarations.json"]
+                            "-module-name", "kotlin-reflection"]
     }
 }
 
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 797744dd9f3..0dfebc55727 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -60,7 +60,6 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jdk7-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index 8baf3466da0..54ffbb547a4 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -63,7 +63,6 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jdk8-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 2df8aea626f..ea809cd0b49 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -53,7 +53,6 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jre7-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index 74d884ed6a4..fd5aba0575b 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -56,7 +56,6 @@ compileKotlin {
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
             "-Xnormalize-constructor-calls=enable",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jre8-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 000cacc740c..1cb466f88fc 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -174,7 +174,6 @@ compileKotlin {
                 "-Xallow-kotlin-package",
                 "-Xmultifile-parts-inherit",
                 "-Xnormalize-constructor-calls=enable",
-                "-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
                 "-module-name", "kotlin-stdlib"
         ]
     }
@@ -189,7 +188,6 @@ compileExperimentalKotlin {
                 "-version",
                 "-Xallow-kotlin-package",
                 "-Xmultifile-parts-inherit",
-                "-Xdump-declarations-to=${buildDir}/stdlib-experimental-declarations.json",
                 "-module-name", "kotlin-stdlib-experimental"
         ]
     }
@@ -205,7 +203,6 @@ compileCoroutinesKotlin {
                 "-version",
                 "-Xallow-kotlin-package",
                 "-Xmultifile-parts-inherit",
-                "-Xdump-declarations-to=${buildDir}/stdlib-coroutines-declarations.json",
                 "-module-name", "kotlin-stdlib-coroutines"
         ]
     }
diff --git a/libraries/stdlib/runtime/build.gradle b/libraries/stdlib/runtime/build.gradle
index a93dbe1dd63..08476d02627 100644
--- a/libraries/stdlib/runtime/build.gradle
+++ b/libraries/stdlib/runtime/build.gradle
@@ -43,7 +43,6 @@ compileKotlin {
         freeCompilerArgs = [
                 "-Xallow-kotlin-package",
                 "-Xnormalize-constructor-calls=enable",
-                "-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
                 "-Xmulti-platform",
                 "-cp", "${rootDir}/dist/builtins",
                 "-module-name", project.name
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index 28bd7881248..d9861bba75c 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -30,23 +30,17 @@ sourceSets {
     }
 }
 
-def testCasesDeclarationsDump = "${buildDir}/cases-declarations.json".toString()
-
 compileTestKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-Xdump-declarations-to=$testCasesDeclarationsDump", "-Xnormalize-constructor-calls=enable"]
+        freeCompilerArgs = ["-Xnormalize-constructor-calls=enable"]
     }
 }
 
 test {
-    dependsOn cleanCompileTestKotlin
     dependsOn configurations.testArtifacts
 
     systemProperty 'overwrite.output', System.getProperty("overwrite.output", "false")
     systemProperty 'kotlinVersion', project.version
     systemProperty 'testCasesClassesDirs', sourceSets.test.output.classesDirs.asPath
-    systemProperty 'testCasesDeclarations', testCasesDeclarationsDump
     jvmArgs '-ea'
-
-    ignoreFailures = System.getenv("kotlin_build_ignore_test_failures") == 'yes'
 }