Skip to content

Commit

Permalink
~ Fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
skuzmich committed Mar 4, 2020
1 parent 7b70c05 commit 0b98fd4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ kotlin.native.ignoreDisabledTargets=true
jekyll_version=4.0

# JS IR baceknd sometimes crashes with out-of-memory
# TODO: Remove once KT-37187 is fixed
org.gradle.jvmargs=-Xmx2g
7 changes: 0 additions & 7 deletions gradle/compile-js-multiplatform.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ compileTestKotlinJs {
kotlinOptions.metaInfo = true
kotlinOptions.sourceMap = true
kotlinOptions.moduleKind = 'umd'
kotlinOptions.freeCompilerArgs += "-XXLanguage:-NewInference"
}

if (project.tasks.findByName('compileKotlinJsIr')) {
compileKotlinJsIr {
kotlinOptions.freeCompilerArgs += "-XXLanguage:-NewInference"
}
}


Expand Down
2 changes: 1 addition & 1 deletion js/example-frontend-js/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'kotlin-dce-js'
apply from: rootProject.file('gradle/node-js.gradle')

// Workaround resolving new Gradle metadata with kotlin2js
// TODO: Remove once plugin is fixed
// TODO: Remove once KT-37188 is fixed
try {
def jsCompilerType = Class.forName("org.jetbrains.kotlin.gradle.targets.js.JsCompilerType")
def jsCompilerAttr = Attribute.of("org.jetbrains.kotlin.js.compiler", jsCompilerType)
Expand Down

0 comments on commit 0b98fd4

Please sign in to comment.