azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Postpone some task configuration to execution phase

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-10-23 01:41:49 +03:00
parent b1dcab886b
commit 40574949c7
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/js/build.gradle
+4 -2
View File
@@ -159,8 +159,10 @@ task compileJs(type: JavaExec) {
} }
main = "org.jetbrains.kotlin.js.FileMergerKt" main = "org.jetbrains.kotlin.js.FileMergerKt"
args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } + doFirst {
["$buildDir/classes/builtins/kotlin.js", "$buildDir/classes/main/kotlin.js"] args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } +
["$buildDir/classes/builtins/kotlin.js", "$buildDir/classes/main/kotlin.js"]
}
classpath = configurations.merger classpath = configurations.merger
doLast { doLast {
libraries/tools/kotlin-reflect/build.gradle
+1 -1
View File
@@ -127,7 +127,7 @@ task proguard(type: proguard.gradle.ProGuardTask) {
injars stripMetadata.outputs.files injars stripMetadata.outputs.files
outjars outputJarPath outjars outputJarPath
libraryjars configurations.proguardDeps.files libraryjars configurations.proguardDeps
libraryjars rtJar libraryjars rtJar
configuration "${core}/reflection.jvm/reflection.pro" configuration "${core}/reflection.jvm/reflection.pro"
prepare/compiler-client-embeddable/build.gradle.kts
+6 -4
View File
@@ -53,10 +53,12 @@ sourceSets {
projectTest { projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject) dependsOnTaskIfExistsRec("dist", project = rootProject)
workingDir = File(rootDir, "libraries/tools/kotlin-compiler-client-embeddable-test/src") workingDir = File(rootDir, "libraries/tools/kotlin-compiler-client-embeddable-test/src")
systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) doFirst {
systemProperty("compilerJar", testRuntimeCompilerJar.singleFile.canonicalPath) systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
systemProperty("stdlibJar", testStdlibJar.singleFile.canonicalPath) systemProperty("compilerJar", testRuntimeCompilerJar.singleFile.canonicalPath)
systemProperty("scriptRuntimeJar", testScriptRuntimeJar.singleFile.canonicalPath) systemProperty("stdlibJar", testStdlibJar.singleFile.canonicalPath)
systemProperty("scriptRuntimeJar", testScriptRuntimeJar.singleFile.canonicalPath)
}
} }
archives.artifacts.let { artifacts -> archives.artifacts.let { artifacts ->