Do not configure dist task for every published module

This change avoids compiling kotlin-compiler-embeddable, kotlin-gradle-plugin, and other gradle plugins, when running `./gradlew dist`
2018-01-30 02:29:50 +03:00
parent d5ee77eb07
commit 29d2679e8d
16 changed files with 33 additions and 14 deletions
@@ -103,6 +103,24 @@ ext.signPom = { Project project, MavenDeployer deployer ->
    }
 }

+ext.configureDist = { Project project ->
+    project.configure(project) {
+        configurations {
+            distJar
+        }
+
+        task dist(type: Copy, dependsOn: assemble) {
+            rename "-${java.util.regex.Pattern.quote(version)}", ''
+            into distLibDir
+            afterEvaluate {
+                project.artifacts {
+                    distJar file: file("$distLibDir${File.separator}${archivesBaseName}.jar"), builtBy: "dist"
+                }
+            }
+        }
+    }
+}
+
 ext.configurePublishing = { Project project ->
    project.configure(project) {
        apply plugin: 'maven'
@@ -120,20 +138,6 @@ ext.configurePublishing = { Project project ->
            }
        }

-        configurations {
-            distJar
-        }
-
-        task dist(type: Copy, dependsOn: assemble) {
-            rename "-${java.util.regex.Pattern.quote(version)}", ''
-            into distLibDir
-            afterEvaluate {
-                project.artifacts {
-                    distJar file: file("$distLibDir${File.separator}${archivesBaseName}.jar"), builtBy: "dist"
-                }
-            }
-        }
-
        uploadArchives {
            def prepareTask = rootProject.preparePublication
            dependsOn prepareTask
@@ -2,6 +2,7 @@ description = 'Kotlin Test Annotations Common'

 apply plugin: 'kotlin-platform-common'

+configureDist(project)
 configurePublishing(project)


@@ -2,6 +2,7 @@ description = 'Kotlin Test Common'

 apply plugin: 'kotlin-platform-common'

+configureDist(project)
 configurePublishing(project)


@@ -2,6 +2,7 @@ description = 'Kotlin Test for JS'

 apply plugin: 'kotlin-platform-js'

+configureDist(project)
 configurePublishing(project)

 dependencies {
@@ -3,6 +3,7 @@ description = 'Kotlin Test JUnit'
 apply plugin: 'kotlin-platform-jvm'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)


@@ -4,6 +4,7 @@ description = 'Kotlin Test'
 apply plugin: 'kotlin-platform-jvm'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)

 dependencies {
@@ -3,6 +3,7 @@ description = 'Kotlin Standard Library'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)

 sourceSets {
@@ -2,6 +2,7 @@ description = 'Kotlin Common Standard Library'

 apply plugin: 'kotlin-platform-common'

+configureDist(project)
 configurePublishing(project)

 def commonSrcDir = "${buildDir}/common-sources"
@@ -3,6 +3,7 @@ description = 'Kotlin Standard Library JDK 7 extension'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_17

@@ -3,6 +3,7 @@ description = 'Kotlin Standard Library JDK 8 extension'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_18
 ext.jvmTarget = "1.8"
@@ -3,6 +3,7 @@ description = 'Kotlin Standard Library JRE 7 extension (deprecated)'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_17

@@ -3,6 +3,7 @@ description = 'Kotlin Standard Library JRE 8 extension (deprecated)'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)
 ext.javaHome = JDK_18
 ext.jvmTarget = "1.8"
@@ -7,6 +7,7 @@ description = 'Kotlin Standard Library for JS'
 apply plugin: 'kotlin2js'
 apply plugin: 'idea'

+configureDist(project)
 configurePublishing(project)


@@ -3,6 +3,7 @@ description = 'Kotlin annotations for JVM'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)

 sourceSets {
@@ -3,6 +3,7 @@ description 'Kotlin Runtime (deprecated, use kotlin-stdlib artifact instead)'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)

 dependencies {
@@ -3,6 +3,7 @@ description 'Kotlin Script Runtime'
 apply plugin: 'kotlin'

 configureJvm6Project(project)
+configureDist(project)
 configurePublishing(project)

 dependencies {