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

Update bootstrap

Browse Source 
New compiler arguments needed to publish JS IR libraries:
    - stdlib
    - kotlin-test
This commit is contained in:
Svyatoslav Kuzmich
2019-10-31 19:06:55 +03:00
parent 1b8df45bfe
commit bc47594c7a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ buildscript {
extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT"
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap("1.3.70-dev-1070", cacheRedirectorEnabled)) kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap("1.3.70-dev-1140", cacheRedirectorEnabled))
repositories { repositories {
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+4
View File
@@ -567,6 +567,10 @@ open class Kotlin2JsCompile : AbstractKotlinCompile<K2JSCompilerArguments>(), Ko
"-Xir-produce-klib-file" "-Xir-produce-klib-file"
).any(freeCompilerArgs::contains) ).any(freeCompilerArgs::contains)
// Kotlin/JS can operate in 3 modes:
// 1) purely pre-IR backend
// 2) purely IR backend
// 3) hybrid pre-IR and IR backend. Can only accept libraries with both JS and IR parts.
private val libraryFilter: (File) -> Boolean private val libraryFilter: (File) -> Boolean
get() = if (kotlinOptions.isIrBackendEnabled()) { get() = if (kotlinOptions.isIrBackendEnabled()) {
if (kotlinOptions.isPreIrBackendDisabled()) { if (kotlinOptions.isPreIrBackendDisabled()) {