From f4912ed43352fc2cf88fb1701f64326a2ffed3fb Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 21 Jan 2020 23:32:29 +0100
Subject: [PATCH] Minor, simplify JS-related build files a bit

* remove test roots in modules which have no tests
* 1.8 is already the default JVM target in the project
* replace compilation dependency on kotlin-reflect with runtime
---
 compiler/cli/cli-js-klib/build.gradle.kts     |  4 +---
 compiler/cli/cli-js/build.gradle.kts          | 14 --------------
 compiler/ir/serialization.js/build.gradle.kts | 11 -----------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/compiler/cli/cli-js-klib/build.gradle.kts b/compiler/cli/cli-js-klib/build.gradle.kts
index f70435180c2..79b818bd6ad 100644
--- a/compiler/cli/cli-js-klib/build.gradle.kts
+++ b/compiler/cli/cli-js-klib/build.gradle.kts
@@ -3,12 +3,10 @@ plugins {
     id("jps-compatible")
 }
 
-jvmTarget = "1.8"
-
 dependencies {
     compile(project(":compiler:cli"))
     compile(project(":compiler:ir.serialization.js"))
-    compile(project(":kotlin-reflect"))
+    runtime(project(":kotlin-reflect"))
     compile(intellijDep()) { includeJars("picocontainer", "trove4j", "guava", "jdom", rootProject = rootProject) }
     compile(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts
index 58d5af170a1..4fbc4db747c 100644
--- a/compiler/cli/cli-js/build.gradle.kts
+++ b/compiler/cli/cli-js/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
     id("jps-compatible")
 }
 
-jvmTarget = "1.8"
-
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
@@ -19,20 +17,8 @@ dependencies {
     compile(project(":js:js.dce"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    testCompile(project(":compiler:backend"))
-    testCompile(project(":compiler:cli"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(commonDep("junit:junit"))
 }
 
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
-}
-
-testsJar {}
-
-projectTest {
-    workingDir = rootDir
 }
diff --git a/compiler/ir/serialization.js/build.gradle.kts b/compiler/ir/serialization.js/build.gradle.kts
index 5ce22dcd9e5..07801bd7cec 100644
--- a/compiler/ir/serialization.js/build.gradle.kts
+++ b/compiler/ir/serialization.js/build.gradle.kts
@@ -10,19 +10,8 @@ dependencies {
     compile(project(":js:js.frontend"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompile(project(":compiler:frontend"))
-    testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:util"))
-
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(intellijDep()) { includeJars("picocontainer", "trove4j", "guava", "jdom", rootProject = rootProject) }
 }
 
 sourceSets {
     "main" { projectDefault() }
-    "test" { projectDefault() }
 }
-
-testsJar {}