From 9073a7b6b03e8933391b8f3e63266cbf67875939 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 13 Feb 2023 12:37:21 +0100
Subject: [PATCH] [Gradle, JS] Not add dom-api-compat if stdlib default
 dependency is disabled

---
 .../kotlin/gradle/KotlinJsDomApiDependencyIT.kt        | 10 +++++-----
 .../gradle/internal/KotlinDependenciesManagement.kt    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt
index 009b14dd37a..8aeb529026e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt
@@ -90,8 +90,8 @@ class KotlinJsDomApiDependencyIT : KGPBaseTest() {
                         """.trimIndent()
             }
 
-            buildAndFail("assemble") {
-                assertTasksFailed(":compileKotlinJs")
+            build("assemble") {
+                assertTasksExecuted(":compileKotlinJs")
             }
 
             buildGradleKts.modify {
@@ -103,8 +103,8 @@ class KotlinJsDomApiDependencyIT : KGPBaseTest() {
                         """.trimIndent().also { added = it }
             }
 
-            buildAndFail("assemble") {
-                assertTasksFailed(":compileKotlinJs")
+            build("assemble") {
+                assertTasksUpToDate(":compileKotlinJs")
             }
 
             buildGradleKts.modify {
@@ -118,7 +118,7 @@ class KotlinJsDomApiDependencyIT : KGPBaseTest() {
             }
 
             build("assemble") {
-                assertTasksExecuted(":compileKotlinJs")
+                assertTasksUpToDate(":compileKotlinJs")
             }
 
             buildGradleKts.modify {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt
index b015381873f..e31546ac345 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt
@@ -43,7 +43,7 @@ internal fun customizeKotlinDependencies(project: Project) {
         )
     }
 
-    if (propertiesProvider.stdlibDefaultDependency && propertiesProvider.stdlibDomApiIncluded) {
+    if (propertiesProvider.stdlibDomApiIncluded) {
         project.configureKotlinDomApiDefaultDependency(topLevelExtension, coreLibrariesVersion)
     }