From 46d9d5456fac8e7ef539851b42d9fe7357c540a8 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 16 Jan 2019 18:22:04 +0300
Subject: [PATCH] Build: Change builtins artifact configuration to default

---
 core/builtins/build.gradle.kts           | 4 +---
 include/kotlin-compiler/build.gradle.kts | 2 +-
 prepare/compiler/build.gradle.kts        | 2 +-
 prepare/compiler/build.gradle.kts.182    | 2 +-
 prepare/compiler/build.gradle.kts.as34   | 2 +-
 prepare/idea-plugin/build.gradle.kts     | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index bf60ca36c85..7e6ba8100fa 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -8,8 +8,6 @@ plugins {
 val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src")
 val builtinsNative = fileFrom(rootDir, "core", "builtins", "native")
 
-val builtins by configurations.creating
-
 val serialize by tasks.creating(NoDebugJavaExec::class) {
     val outDir = "$buildDir/$name"
     val inDirs = arrayOf(builtinsSrc, builtinsNative)
@@ -34,4 +32,4 @@ val assemble by tasks.getting {
     dependsOn(serialize)
 }
 
-artifacts.add(builtins.name, builtinsJar)
+artifacts.add("default", builtinsJar)
diff --git a/include/kotlin-compiler/build.gradle.kts b/include/kotlin-compiler/build.gradle.kts
index e288c5885ae..8e93db24566 100644
--- a/include/kotlin-compiler/build.gradle.kts
+++ b/include/kotlin-compiler/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
         compile(project(module)) { isTransitive = false }
     }
 
-    fatJarContents(project(":core:builtins", configuration = "builtins"))
+    fatJarContents(project(":core:builtins"))
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 60c47f3c16c..12c385048c6 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
 
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
-    fatJarContents(project(":core:builtins", configuration = "builtins"))
+    fatJarContents(project(":core:builtins"))
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.182
index 1e2149445e0..69a7a797b47 100644
--- a/prepare/compiler/build.gradle.kts.182
+++ b/prepare/compiler/build.gradle.kts.182
@@ -71,7 +71,7 @@ dependencies {
 
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
-    fatJarContents(project(":core:builtins", configuration = "builtins"))
+    fatJarContents(project(":core:builtins"))
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
diff --git a/prepare/compiler/build.gradle.kts.as34 b/prepare/compiler/build.gradle.kts.as34
index c89add3a78a..b97f6eb8fbf 100644
--- a/prepare/compiler/build.gradle.kts.as34
+++ b/prepare/compiler/build.gradle.kts.as34
@@ -71,7 +71,7 @@ dependencies {
 
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
-    fatJarContents(project(":core:builtins", configuration = "builtins"))
+    fatJarContents(project(":core:builtins"))
     fatJarContents(commonDep("javax.inject"))
     fatJarContents(commonDep("org.jline", "jline"))
     fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 4fdbbbfcbaa..372a57a299d 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -75,7 +75,7 @@ val sideJars by configurations.creating
 
 dependencies {
     packedJars(protobufFull())
-    packedJars(project(":core:builtins", configuration = "builtins"))
+    packedJars(project(":core:builtins"))
     sideJars(project(":kotlin-script-runtime"))
     sideJars(project(":kotlin-stdlib"))
     sideJars(project(":kotlin-stdlib-jdk7"))