Build: Collect sources for compiler lazily to avoid evaluationDependsOn

prepare/compiler/build.gradle.kts

@@ -1,8 +1,5 @@
-import java.io.File
-import proguard.gradle.ProGuardTask
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.COMPILE
+import proguard.gradle.ProGuardTask
-import org.gradle.api.file.DuplicatesStrategy
 
 description = "Kotlin Compiler"
 
@@ -21,7 +18,6 @@ val fatJarContents by configurations.creating
 
 val fatJarContentsStripMetadata by configurations.creating
 val fatJarContentsStripServices by configurations.creating
-val fatSourcesJarContents by configurations.creating
 val fatJar by configurations.creating
 val compilerJar by configurations.creating
 val runtimeJar by configurations.creating
@@ -40,12 +36,6 @@ val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
 
-compilerModules.forEach { evaluationDependsOn(it) }
-
-val compiledModulesSources = compilerModules.map {
-    project(it).mainSourceSet.allSource
-}
-
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -65,10 +55,6 @@ dependencies {
         fatJarContents(project(it)) { isTransitive = false }
     }
 
-    compiledModulesSources.forEach {
-        fatSourcesJarContents(it)
-    }
-
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
@@ -154,7 +140,11 @@ runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
 }
 
 sourcesJar {
-    from(fatSourcesJarContents)
+    from {
+        compilerModules.map {
+            project(it).mainSourceSet.allSource
+        }
+    }
 }
 
 javadocJar()

prepare/compiler/build.gradle.kts.182

@@ -1,8 +1,5 @@
-import java.io.File
-import proguard.gradle.ProGuardTask
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.COMPILE
+import proguard.gradle.ProGuardTask
-import org.gradle.api.file.DuplicatesStrategy
 
 description = "Kotlin Compiler"
 
@@ -21,7 +18,6 @@ val fatJarContents by configurations.creating
 
 val fatJarContentsStripMetadata by configurations.creating
 val fatJarContentsStripServices by configurations.creating
-val fatSourcesJarContents by configurations.creating
 val fatJar by configurations.creating
 val compilerJar by configurations.creating
 val runtimeJar by configurations.creating
@@ -40,12 +36,6 @@ val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
 
-compilerModules.forEach { evaluationDependsOn(it) }
-
-val compiledModulesSources = compilerModules.map {
-    project(it).mainSourceSet.allSource
-}
-
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -65,10 +55,6 @@ dependencies {
         fatJarContents(project(it)) { isTransitive = false }
     }
 
-    compiledModulesSources.forEach {
-        fatSourcesJarContents(it)
-    }
-
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
@@ -86,17 +72,9 @@ dependencies {
             !(it.startsWith("jdom") || it.startsWith("log4j") || it.startsWith("trove4j"))
         }
     }
-    when {
+    fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") }
-        Platform[181].orLower() -> {
-            fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-java-1.3") }
-            fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j") }
-        }
-        else -> {
-            fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") }
-            fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j") }
-        }
-    }
     fatJarContentsStripServices(jpsStandalone()) { includeJars("jps-model") }
+    fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) }
 }
 
 publish()
@@ -162,7 +140,11 @@ runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
 }
 
 sourcesJar {
-    from(fatSourcesJarContents)
+    from {
+        compilerModules.map {
+            project(it).mainSourceSet.allSource
+        }
+    }
 }
 
 javadocJar()

prepare/compiler/build.gradle.kts.as34

@@ -1,8 +1,5 @@
-import java.io.File
-import proguard.gradle.ProGuardTask
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.COMPILE
+import proguard.gradle.ProGuardTask
-import org.gradle.api.file.DuplicatesStrategy
 
 description = "Kotlin Compiler"
 
@@ -21,7 +18,6 @@ val fatJarContents by configurations.creating
 
 val fatJarContentsStripMetadata by configurations.creating
 val fatJarContentsStripServices by configurations.creating
-val fatSourcesJarContents by configurations.creating
 val fatJar by configurations.creating
 val compilerJar by configurations.creating
 val runtimeJar by configurations.creating
@@ -40,12 +36,6 @@ val outputJar = fileFrom(buildDir, "libs", "$compilerBaseName.jar")
 
 val compilerModules: Array<String> by rootProject.extra
 
-compilerModules.forEach { evaluationDependsOn(it) }
-
-val compiledModulesSources = compilerModules.map {
-    project(it).mainSourceSet.allSource
-}
-
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -65,10 +55,6 @@ dependencies {
         fatJarContents(project(it)) { isTransitive = false }
     }
 
-    compiledModulesSources.forEach {
-        fatSourcesJarContents(it)
-    }
-
     trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
 
     fatJarContents(kotlinBuiltins())
@@ -154,7 +140,11 @@ runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
 }
 
 sourcesJar {
-    from(fatSourcesJarContents)
+    from {
+        compilerModules.map {
+            project(it).mainSourceSet.allSource
+        }
+    }
 }
 
 javadocJar()