Build: Centralize compiler dist build logic in :kotlin-compiler project

buildSrc/src/main/kotlin/artifacts.kt

@@ -151,31 +151,6 @@ fun Project.publish(body: Upload.() -> Unit = {}): Upload {
     }
 }
 
-fun Project.dist(
-    targetDir: File? = null,
-    targetName: String? = null,
-    fromTask: Task? = null,
-    body: AbstractCopyTask.() -> Unit = {}
-): AbstractCopyTask {
-    val distJarCfg = configurations.getOrCreate("distJar")
-    val distLibDir: File by rootProject.extra
-    val distJarName = targetName ?: (the<BasePluginConvention>().archivesBaseName + ".jar")
-    val thisProject = this
-
-    return task<Copy>("dist") {
-        body()
-        (fromTask ?: runtimeJarTaskIfExists())?.let {
-            from(it)
-            if (targetName != null) {
-                rename(it.outputs.files.singleFile.name, targetName)
-            }
-        }
-        rename("-${java.util.regex.Pattern.quote(thisProject.version.toString())}", "")
-        into(targetDir ?: distLibDir)
-        project.addArtifact(distJarCfg, this, File(targetDir ?: distLibDir, distJarName))
-    }
-}
-
 private fun Project.runtimeJarTaskIfExists(): Task? =
     if (extra.has("runtimeJarTask")) extra["runtimeJarTask"] as Task
     else tasks.findByName("jar")

buildSrc/src/main/kotlin/dependencies.kt

@@ -73,13 +73,14 @@ fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir:
     else files()
 }
 
-fun Project.kotlinDep(artifactBaseName: String, version: String): String = "org.jetbrains.kotlin:kotlin-$artifactBaseName:$version"
+fun Project.kotlinDep(artifactBaseName: String, version: String, classifier: String? = null): String =
+    listOfNotNull("org.jetbrains.kotlin:kotlin-$artifactBaseName:$version", classifier).joinToString(":")
 
-fun Project.kotlinStdlib(suffix: String? = null): Any {
+fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): Any {
     return if (kotlinBuildProperties.useBootstrapStdlib)
-        kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion)
+        kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier)
     else
-        dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"))
+        dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier)
 }
 
 fun Project.kotlinBuiltins(): Any =