diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 6c7a703a593..00564a24116 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -831,33 +831,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(val irBackend: Boolean) : BaseGra } } - @Test - fun testUpdatingPackageJsonOnDependenciesClash() = with(Project("kotlin-js-dependencies-clash")) { - setupWorkingDir() - gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) - - fun assertFileVersion( - packageJson: PackageJson, - dependency: String - ) { - val version = packageJson.dependencies[dependency]!! - assertTrue("${packageJson.name} must have $dependency with file version, but $version found") { - version.isFileVersion() - } - } - - build("packageJson", "rootPackageJson", "kotlinNpmInstall") { - assertSuccessful() - - val basePackageJson = getSubprojectPackageJson("base") - val libPackageJson = getSubprojectPackageJson("lib") - - val dependency = "kotlinx-coroutines-core" - assertFileVersion(basePackageJson, dependency) - assertFileVersion(libPackageJson, dependency) - } - } - @Test fun testYarnResolution() = with(Project("kotlin-js-yarn-resolutions")) { setupWorkingDir() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/build.gradle.kts deleted file mode 100644 index bac8245d455..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.BOTH as BOTH_TYPE - -plugins { - kotlin("js") -} - -dependencies { - implementation(kotlin("stdlib-js")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.5") -} - -kotlin { - js { - useCommonJs() - nodejs { - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/src/main/kotlin/Base.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/src/main/kotlin/Base.kt deleted file mode 100644 index e69d852c3e0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/base/src/main/kotlin/Base.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package com.example - -fun best(): Int { - return 42 -} - -fun simpleBest(): Int { - return 73 -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/build.gradle.kts deleted file mode 100644 index 83a117202ec..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - kotlin("js").version("").apply(false) -} - -group = "com.example" -version = "1.0" - -allprojects { - repositories { - mavenLocal() - mavenCentral() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/build.gradle.kts deleted file mode 100644 index 5950432c244..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - kotlin("js") -} - -dependencies { - implementation(kotlin("stdlib-js")) - implementation(project(":base")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.7") -} - -kotlin { - target { - useCommonJs() - nodejs { - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/src/main/kotlin/Lib.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/src/main/kotlin/Lib.kt deleted file mode 100644 index 9ec1e64a28c..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/lib/src/main/kotlin/Lib.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package com.example - -fun answer(): Int { - return best() -} - -fun sheldon(): Int { - return simpleBest() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/settings.gradle.kts deleted file mode 100644 index 2efc39ffb72..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-dependencies-clash/settings.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - -rootProject.name = "kotlin-js-dependencies-clash" - -include("base") -include("lib") \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/settings.gradle.kts index 2efc39ffb72..f2be43ab08f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/settings.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { } } -rootProject.name = "kotlin-js-dependencies-clash" +rootProject.name = "kotlin-js-yarn-resolutions" include("base") include("lib") \ No newline at end of file