From 0d8c779190fb99c01c703a326239669a6b431161 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 16 Jan 2019 18:19:00 +0300
Subject: [PATCH] Build: Change builtins serialization task output directory to
 local

---
 core/builtins/build.gradle.kts        | 12 ++----------
 libraries/stdlib/jvm/build.gradle     | 12 +++++++++---
 libraries/stdlib/runtime/build.gradle | 10 +++++++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index 22d92d62114..bf60ca36c85 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -7,19 +7,11 @@ plugins {
 
 val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src")
 val builtinsNative = fileFrom(rootDir, "core", "builtins", "native")
-// TODO: rewrite dependent projects on using build results instead of the fixed location
-val builtinsSerialized = File(rootProject.extra["distDir"].toString(), "builtins")
 
 val builtins by configurations.creating
 
-val clean by tasks.getting {
-    doLast {
-        delete(builtinsSerialized)
-    }
-}
-
 val serialize by tasks.creating(NoDebugJavaExec::class) {
-    val outDir = builtinsSerialized
+    val outDir = "$buildDir/$name"
     val inDirs = arrayOf(builtinsSrc, builtinsNative)
     inDirs.forEach { inputs.dir(it) }
     outputs.dir(outDir)
@@ -32,7 +24,7 @@ val serialize by tasks.creating(NoDebugJavaExec::class) {
 
 val builtinsJar by task<Jar> {
     dependsOn(serialize)
-    from(builtinsSerialized) { include("kotlin/**") }
+    from(serialize) { include("kotlin/**") }
     baseName = "platform-builtins"
     destinationDir = File(buildDir, "libs")
 }
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 4877f630369..03964e0bfd0 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -65,6 +65,7 @@ configurations {
     coroutinesExperimentalTestCompile.extendsFrom(testCompile)
     coroutinesExperimentalMigrationTestCompile.extendsFrom(coroutinesExperimentalTestCompile)
     longRunningTestCompile.extendsFrom(testCompile)
+    builtins
 }
 
 dependencies {
@@ -79,11 +80,16 @@ dependencies {
 
     coroutinesExperimentalCompile sourceSets.main.output
     coroutinesExperimentalTestCompile sourceSets.test.output
+
+    builtins project(':core:builtins')
 }
 
 jar {
+    dependsOn(configurations.builtins)
     manifestAttributes(manifest, project, 'Main' /*true*/)
-    from("${rootDir}/dist/builtins")
+    from {
+        zipTree(configurations.builtins.asPath)
+    }
     from sourceSets.experimental.output
     from sourceSets.coroutinesExperimental.output
     // TODO: enable as soon as this doesn't cause D8/DX to crash
@@ -152,8 +158,8 @@ task dexMethodCount(type: DexMethodCount) {
 check.dependsOn(dexMethodCount)
 
 compileKotlin {
-    dependsOn(":core:builtins:serialize")
-    classpath += files("${rootDir}/dist/builtins")
+    dependsOn(configurations.builtins)
+    classpath += configurations.builtins
     kotlinOptions {
         freeCompilerArgs = [
                 "-version",
diff --git a/libraries/stdlib/runtime/build.gradle b/libraries/stdlib/runtime/build.gradle
index 15c79646f66..d5d7ce7a6d4 100644
--- a/libraries/stdlib/runtime/build.gradle
+++ b/libraries/stdlib/runtime/build.gradle
@@ -6,8 +6,13 @@ apply plugin: 'kotlin'
 
 configureJvm6Project(project)
 
+configurations {
+    builtins
+}
+
 dependencies {
     compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
+    builtins project(':core:builtins')
 }
 
 sourceSets {
@@ -23,8 +28,11 @@ sourceSets {
 }
 
 jar {
+    dependsOn(configurations.builtins)
     manifestAttributes(manifest, project, 'Main')
-    from("${rootDir}/dist/builtins")
+    from {
+        zipTree(configurations.builtins.asPath)
+    }
 }
 
 sourcesJar {