Skip to content

Commit

Permalink
Remove workarounds for Kotlin 1.3 (#2519)
Browse files Browse the repository at this point in the history
  • Loading branch information
turansky authored Feb 16, 2021
1 parent 01dcfe5 commit a11e185
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions gradle/compile-js-multiplatform.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@ apply from: rootProject.file('gradle/node-js.gradle')

kotlin {
js {
// In 1.3.7x js() has not member `moduleName`
// In 1.4.x it has and allow to safety set compiler output file name and does not break test integration
if (it.hasProperty("moduleName")) {
moduleName = project.name
}
moduleName = project.name

// In 1.3.7x js() has not member `irTarget`
// In 1.4.x it has in `both` and `legacy` mode and js() is of type `KotlinJsTarget`
// `irTarget` is non-null in `both` mode
// and contains appropriate `irTarget` with type `KotlinJsIrTarget`
// `irTarget` is null in `legacy` mode
if (it.hasProperty("irTarget") && it.irTarget != null) {
if (it.irTarget != null) {
irTarget.nodejs()
irTarget.compilations['main']?.dependencies {
api "org.jetbrains.kotlinx:atomicfu-js:$atomicfu_version"
Expand Down

0 comments on commit a11e185

Please # to comment.