From 4cb8a3a6b7db214d1be81408d72136c933a71ed5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 7 Nov 2017 18:21:00 +0100
Subject: [PATCH] Remove obsolete workaround for jansi clash issue

This was needed to workaround KT-17031 which is now fixed
---
 build.gradle.kts                     | 4 ----
 core/builtins/build.gradle.kts       | 1 -
 libraries/commonConfiguration.gradle | 8 --------
 3 files changed, 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 56e95577075..7eb13c65627 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -459,7 +459,6 @@ fun jdkPath(version: String): String = jdkPathIfFound(version)
         ?: throw GradleException ("Please set environment variable JDK_${version.replace(".", "")} to point to JDK $version installation")
 
 fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
-
     tasks.withType<JavaCompile> {
         options.isFork = true
         options.forkOptions.javaHome = file(javaHome)
@@ -470,9 +469,6 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
     tasks.withType<KotlinCompile> {
         kotlinOptions.jdkHome = javaHome
         kotlinOptions.jvmTarget = javaVersion
-        doFirst {
-            System.setProperty("kotlin.colors.enabled", "false")
-        }
     }
 
     tasks.withType<Test> {
diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index 08e3070eb8c..46b33f85158 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -16,7 +16,6 @@ val serialize = task("serialize") {
     outputs.dir(outDir)
     inputs.files(*inDirs)
     doLast {
-        System.setProperty("kotlin.colors.enabled", "false")
         BuiltInsSerializer(dependOnOldBuiltIns = false)
                 .serialize(outDir, inDirs.asList(), listOf()) { totalSize, totalFiles ->
                     println("Total bytes written: $totalSize to $totalFiles files")
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 9cb0fe1e747..88c6d94e918 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -22,17 +22,12 @@ ext.configureJvmProject = { Project project ->
         }
 
         tasks.withType(JavaCompile) {
-//            sourceCompatibility = 1.6
-//            targetCompatibility = 1.6
             options.fork = true
             options.forkOptions.javaHome = file(JDK_18)
         }
 
         tasks.withType(project.compileKotlin.class) {
             kotlinOptions.jdkHome = JDK_18
-            doFirst {
-                System.setProperty("kotlin.colors.enabled", "false")
-            }
         }
 
         test {
@@ -61,9 +56,6 @@ ext.configureJvm6Project = { Project project ->
         tasks.withType(project.compileKotlin.class) {
             kotlinOptions.jdkHome = JDK_16
             kotlinOptions.jvmTarget = "1.6"
-            doFirst {
-                System.setProperty("kotlin.colors.enabled", "false")
-            }
         }
 
         test {