From 6c5d78d8d5bad4409a64b2fd20fd6d4ef368c409 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 25 Oct 2017 05:16:45 +0300
Subject: [PATCH] Remove deprecated build tasks

---
 build.gradle.kts          | 29 +----------------------------
 compiler/build.gradle.kts | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4246d104b20..45e5190dbec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -302,11 +302,6 @@ task<Copy>("ideaPlugin") {
     into("$ideaPluginDir/lib")
 }
 
-task("dist-plugin") {
-    dependsOn("ideaPlugin")
-    doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") }
-}
-
 tasks {
     "clean" {
         doLast {
@@ -343,30 +338,15 @@ tasks {
                   ":compiler:tests-java8:test")
     }
 
-    "compiler-tests" {
-        dependsOn("jvmCompilerTest")
-        doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") }
-    }
-
     "jsCompilerTest" {
         dependsOn(":js:js.tests:test")
     }
 
-    "js-tests" {
-        dependsOn("jsCompilerTest")
-        doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") }
-    }
-
     "scriptingTest" {
         dependsOn("dist")
         dependsOn(":kotlin-script-util:test")
     }
 
-    "scripting-tests" {
-        dependsOn("scriptingTest")
-        doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") }
-    }
-
     "compilerTest" {
         dependsOn("jvmCompilerTest")
         dependsOn("jsCompilerTest")
@@ -429,14 +409,7 @@ tasks {
                   ":plugins:uast-kotlin:test",
                   ":kotlin-annotation-processing-gradle:test")
     }
-
-    "other-tests" {
-        dependsOn("dist")
-        dependsOn(":kotlin-build-common:test",
-                  ":generators:test")
-        doFirst { logger.warn("'$name' task is deprecated") }
-    }
-
+    
 
     "ideaPluginTest" {
         dependsOn(
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 0c998878e19..579e98c738c 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -84,7 +84,9 @@ projectTest {
 
 evaluationDependsOn(":compiler:tests-common-jvm6")
 
-fun Project.codegenTest(taskName: String, jdk: String, body: Test.() -> Unit): Test = projectTest(taskName) {
+fun Project.codegenTest(target: Int, jvm: Int,
+                        jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
+                        body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
     dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     workingDir = rootDir
 
@@ -103,14 +105,10 @@ fun Project.codegenTest(taskName: String, jdk: String, body: Test.() -> Unit): T
         executable = "$jdkPath/bin/java"
         println("Running test with $executable")
     }
-}.also {
-    task(taskName.replace(Regex("-[a-z]"), { it.value.takeLast(1).toUpperCase() })) {
-        dependsOn(it)
-        group = "verification"
-    }
+    group = "verification"
 }
 
-codegenTest("codegen-target6-jvm6-test", "JDK_18") {
+codegenTest(target = 6, jvm = 6, jdk = "JDK_18") {
     dependsOn(":compiler:tests-common-jvm6:build")
 
     //TODO make port flexible
@@ -150,19 +148,19 @@ codegenTest("codegen-target6-jvm6-test", "JDK_18") {
     }
 }
 
-codegenTest("codegen-target6-jvm9-test", "JDK_9") {
+codegenTest(target = 6, jvm = 9) {
     systemProperty("kotlin.test.default.jvm.target", "1.6")
 }
 
-codegenTest("codegen-target8-jvm8-test", "JDK_18") {
+codegenTest(target = 8, jvm = 8) {
     systemProperty("kotlin.test.default.jvm.target", "1.8")
 }
 
-codegenTest("codegen-target8-jvm9-test", "JDK_9") {
+codegenTest(target = 8, jvm = 9) {
     systemProperty("kotlin.test.default.jvm.target", "1.8")
 }
 
-codegenTest("codegen-target9-jvm9-test", "JDK_9") {
+codegenTest(target = 9, jvm = 9) {
     systemProperty("kotlin.test.default.jvm.target", "1.8")
     systemProperty("kotlin.test.substitute.bytecode.1.8.to.1.9", "true")
 }