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

Serialize builtins *before* compiling builtins in stdlib

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-09-12 23:32:05 +03:00
committed by Ilya Chernikov
parent 47eedd1941
commit e3899ff7ee
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/build.gradle
+1 -3
View File
@@ -61,7 +61,6 @@ task originalStdlibJar(type: Jar) {
jar { jar {
manifestAttributes(manifest, project, 'Main') manifestAttributes(manifest, project, 'Main')
dependsOn ":core:builtins:serialize"
from("${rootDir}/dist/builtins") from("${rootDir}/dist/builtins")
from sourceSets.builtins.output from sourceSets.builtins.output
} }
@@ -70,7 +69,6 @@ task distJar(type: Jar) {
baseName = 'dist-kotlin-stdlib' baseName = 'dist-kotlin-stdlib'
version = null version = null
manifestAttributes(manifest, project, 'Main') manifestAttributes(manifest, project, 'Main')
dependsOn ":core:builtins:serialize"
from("${rootDir}/dist/builtins") from("${rootDir}/dist/builtins")
from sourceSets.annotations.output from sourceSets.annotations.output
from sourceSets.builtins.output from sourceSets.builtins.output
@@ -79,7 +77,6 @@ task distJar(type: Jar) {
task builtinsJar(type: Jar) { task builtinsJar(type: Jar) {
baseName = "builtins" baseName = "builtins"
dependsOn ":core:builtins:serialize"
from("${rootDir}/dist/builtins") from("${rootDir}/dist/builtins")
from sourceSets.builtins.output from sourceSets.builtins.output
} }
@@ -113,6 +110,7 @@ dist {
} }
compileBuiltinsKotlin { compileBuiltinsKotlin {
dependsOn ":core:builtins:serialize"
kotlinOptions { kotlinOptions {
freeCompilerArgs = [ freeCompilerArgs = [
"-version", "-version",