From 0b9f2be157bec27391dc008c622d6dadcb602352 Mon Sep 17 00:00:00 2001 From: Elena Lepilkina Date: Mon, 13 Apr 2020 13:07:27 +0300 Subject: [PATCH 1/2] Fix in gradle for JS IR in case it doesn't exist --- gradle/compile-js-multiplatform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/compile-js-multiplatform.gradle b/gradle/compile-js-multiplatform.gradle index e09e8e26b4..01ad24f34d 100644 --- a/gradle/compile-js-multiplatform.gradle +++ b/gradle/compile-js-multiplatform.gradle @@ -10,8 +10,8 @@ kotlin { // Enable built-in test runner only for IR target. // These runners don't support changing js module name change. if (js.hasProperty("irTarget")) { - irTarget.nodejs() - irTarget?.compilations['main']?.dependencies { + irTarget?.nodejs() + irTarget?.compilations?.get('main')?.dependencies { api "org.jetbrains.kotlinx:atomicfu-js:$atomicfu_version" } } From 1ee02c5d6899aa37f127d6caea35de0308026acb Mon Sep 17 00:00:00 2001 From: Elena Lepilkina Date: Mon, 13 Apr 2020 13:20:59 +0300 Subject: [PATCH 2/2] Review feedback --- gradle/compile-js-multiplatform.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/compile-js-multiplatform.gradle b/gradle/compile-js-multiplatform.gradle index 01ad24f34d..2b00d6fc82 100644 --- a/gradle/compile-js-multiplatform.gradle +++ b/gradle/compile-js-multiplatform.gradle @@ -9,9 +9,9 @@ kotlin { fromPreset(presets.js, 'js') { // Enable built-in test runner only for IR target. // These runners don't support changing js module name change. - if (js.hasProperty("irTarget")) { - irTarget?.nodejs() - irTarget?.compilations?.get('main')?.dependencies { + if (js.hasProperty("irTarget") && irTarget != null) { + irTarget.nodejs() + irTarget.compilations['main']?.dependencies { api "org.jetbrains.kotlinx:atomicfu-js:$atomicfu_version" } }