From 13d6e96c2f5b8cf0d47a12f3589804045f528d6c Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 14 Oct 2017 07:24:29 +0300
Subject: [PATCH] Do not pack build.txt into jars, leave it only in artifact
 zip bundles

---
 buildSrc/src/main/kotlin/artifacts.kt  | 8 --------
 prepare/build.version/build.gradle.kts | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
index bf814d76dc2..0e090360891 100644
--- a/buildSrc/src/main/kotlin/artifacts.kt
+++ b/buildSrc/src/main/kotlin/artifacts.kt
@@ -61,18 +61,10 @@ fun<T> Project.runtimeJarArtifactBy(task: Task, artifactRef: T, body: Configurab
     addArtifact("runtimeJar", task, artifactRef, body)
 }
 
-fun Project.buildVersion(): Dependency {
-    val cfg = configurations.create("build-version")
-    return dependencies.add(cfg.name, dependencies.project(":prepare:build.version", configuration = "buildVersion"))
-}
-
 fun<T: Jar> Project.runtimeJar(task: T, body: T.() -> Unit = {}): T {
-    val buildVersionCfg = configurations.create("buildVersion")
-    dependencies.add(buildVersionCfg.name, dependencies.project(":prepare:build.version", configuration = "buildVersion"))
     extra["runtimeJarTask"] = task
     return task.apply {
         setupPublicJar()
-        from(buildVersionCfg) { into("META-INF") }
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         body()
         project.runtimeJarArtifactBy(this, this)
diff --git a/prepare/build.version/build.gradle.kts b/prepare/build.version/build.gradle.kts
index 93974729632..093c438af82 100644
--- a/prepare/build.version/build.gradle.kts
+++ b/prepare/build.version/build.gradle.kts
@@ -29,6 +29,6 @@ artifacts.add(buildVersion.name, file(buildVersionFilePath)) {
 val distKotlinHomeDir: String by rootProject.extra
 
 val dist by task<Copy> {
+    from(prepare)
     into(File(distKotlinHomeDir))
-    from(buildVersionFilePath)
 }