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

libraries/kotlin.test/annotations-common/build.gradle

@@ -3,10 +3,8 @@ description = 'Kotlin Test Annotations Common'
 apply plugin: 'kotlin-platform-common'
 apply plugin: 'pill-configurable'
 
-configureDist(project)
 configurePublishing(project)
 
-
 dependencies {
     compile kotlinStdlib("common")
     testCompile project(":kotlin-test:kotlin-test-common")

libraries/kotlin.test/common/build.gradle

@@ -3,10 +3,8 @@ description = 'Kotlin Test Common'
 apply plugin: 'kotlin-platform-common'
 apply plugin: 'pill-configurable'
 
-configureDist(project)
 configurePublishing(project)
 
-
 dependencies {
     compile kotlinStdlib("common")
     testCompile project(":kotlin-test:kotlin-test-annotations-common")

libraries/kotlin.test/js-ir/build.gradle

@@ -68,11 +68,3 @@ artifacts {
 if (project.findProperty("kotlin.stdlib.js.ir.publish")?.toBoolean() == true) {
     configurePublishing(project)
 }
-
-if (project.findProperty("kotlin.stdlib.js.ir.dist")?.toBoolean() == true) {
-    configureDist(project)
-
-    dist {
-        from(jar, sourcesJar)
-    }
-}

libraries/kotlin.test/js/build.gradle

@@ -2,9 +2,13 @@ description = 'Kotlin Test for JS'
 
 apply plugin: 'kotlin-platform-js'
 
-configureDist(project)
 configurePublishing(project)
 
+configurations {
+    sources
+    distJs
+}
+
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
@@ -44,17 +48,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     archives sourcesJar
+    sources sourcesJar
+    distJs(file(compileKotlin2Js.kotlinOptions.outputFile)) {
+        builtBy(compileKotlin2Js)
+    }
 }
 
 javadocJar()
-
-task distJs(type: Copy) {
-    dependsOn(compileKotlin2Js)
-    from(compileKotlin2Js.kotlinOptions.outputFile)
-    into "$distDir/js"
-}
-
-dist {
-    dependsOn distJs
-    from (jar, sourcesJar)
-}

libraries/kotlin.test/junit/build.gradle

@@ -4,7 +4,6 @@ apply plugin: 'kotlin-platform-jvm'
 apply plugin: 'pill-configurable'
 
 configureJvm6Project(project)
-configureDist(project)
 configurePublishing(project)
 
 pill {
@@ -24,14 +23,11 @@ jar {
 
 artifacts {
     archives sourcesJar
+    sources sourcesJar
 }
 
 javadocJar()
 
-dist {
-    from (jar, sourcesJar)
-}
-
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
 }

libraries/kotlin.test/junit5/build.gradle

@@ -3,7 +3,6 @@ description = 'Kotlin Test JUnit 5'
 apply plugin: 'kotlin-platform-jvm'
 
 configureJvm6Project(project)
-configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_18
 ext.jvmTarget = "1.8"
@@ -24,14 +23,11 @@ jar {
 
 artifacts {
     archives sourcesJar
+    sources sourcesJar
 }
 
 javadocJar()
 
-dist {
-    from (jar, sourcesJar)
-}
-
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions.jdkHome = JDK_18
     kotlinOptions.jvmTarget = 1.8

libraries/kotlin.test/jvm/build.gradle

@@ -4,7 +4,6 @@ apply plugin: 'kotlin-platform-jvm'
 apply plugin: 'pill-configurable'
 
 configureJvm6Project(project)
-configureDist(project)
 configurePublishing(project)
 
 pill {
@@ -47,15 +46,12 @@ task modularJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
+    sources sourcesJar
     archives modularJar
 }
 
 javadocJar()
 
-dist {
-    from (jar, sourcesJar)
-}
-
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
                                       "-Xuse-experimental=kotlin.contracts.ExperimentalContracts",

libraries/kotlin.test/testng/build.gradle

@@ -3,32 +3,26 @@ description = 'Kotlin Test TestNG'
 apply plugin: 'kotlin-platform-jvm'
 
 configureJvm6Project(project)
-configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_17
 
-
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
     compile project(':kotlin-test:kotlin-test-jvm')
     compile('org.testng:testng:6.13.1')
 }
 
-
 jar {
     manifestAttributes(manifest, project, 'Test')
 }
 
 artifacts {
     archives sourcesJar
+    sources sourcesJar
 }
 
 javadocJar()
 
-dist {
-    from (jar, sourcesJar)
-}
-
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
 }