From 77765a80640094de31db96778dbd0a65bbc5f661 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 26 Sep 2017 17:17:01 +0300
Subject: [PATCH] Do not run proguard by default, unless
 "kotlin.build.proguard" is "true"

---
 prepare/compiler/build.gradle.kts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 730c0c5a181..0c2df80e723 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -21,8 +21,11 @@ plugins {
     `java`
 }
 
-// Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build
-val shrink = true
+// You can run Gradle with "-Pkotlin.build.proguard=true" to enable ProGuard run on kotlin-compiler.jar (on TeamCity, ProGuard always runs)
+val shrink =
+        findProperty("kotlin.build.proguard")?.toString()?.toBoolean()
+        ?: hasProperty("teamcity")
+
 val compilerManifestClassPath =
         "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
 
@@ -120,11 +123,12 @@ noDefaultJar()
 
 cleanArtifacts()
 
-dist(targetName = compilerBaseName + ".jar",
-     fromTask = if (shrink) proguard
-                else packCompiler)
+val pack = if (shrink) proguard else packCompiler
 
-runtimeJarArtifactBy(proguard, proguard.outputs.files.singleFile) {
+dist(targetName = compilerBaseName + ".jar",
+     fromTask = pack)
+
+runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
     name = compilerBaseName
     classifier = ""
 }