diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt index 563389edd2f..899ae815d19 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt @@ -163,15 +163,26 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() { gradleBuildScript().appendText( "\n" + """ dependencies { - jvm6CompilationImplementation project(':${innerJvmProject.projectName}') - jvm6TestCompilationRuntimeOnly project(':${innerJvmProject.projectName}') - nodeJsCompilationImplementation project(':${innerJsProject.projectName}') - nodeJsTestCompilationRuntimeOnly project(':${innerJsProject.projectName}') + def jvmCompilations = kotlin.getTargets().getByName("jvm6").getCompilations() + def jsCompilations = kotlin.getTargets().getByName("nodeJs").getCompilations() + + def jvmMainImplConfigName = jvmCompilations.getByName("main").getImplementationConfigurationName() + def jvmTestImplConfigName = jvmCompilations.getByName("test").getImplementationConfigurationName() + def jsMainImplConfigName = jsCompilations.getByName("main").getImplementationConfigurationName() + def jsTestImplConfigName = jsCompilations.getByName("test").getImplementationConfigurationName() + + add(jvmMainImplConfigName, project(':${innerJvmProject.projectName}')) + add(jvmTestImplConfigName, project(':${innerJvmProject.projectName}')) + add(jsMainImplConfigName, project(':${innerJsProject.projectName}')) + add(jsTestImplConfigName, project(':${innerJsProject.projectName}')) } """.trimIndent() ) - testResolveAllConfigurations(innerJvmProject.projectName, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) + testResolveAllConfigurations( + innerJvmProject.projectName, + options = defaultBuildOptions().copy(warningMode = WarningMode.Summary), + ) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle index 117de65adf7..a19db0bf1c0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle @@ -20,9 +20,12 @@ kotlin.targets.fromPreset(kotlin.presets.js, 'browser') { } dependencies { - browserCompilationImplementation project(":libraryProject") - browserCompilationImplementation "org.jetbrains.kotlin:kotlin-stdlib-js" - browserCompilationImplementation "org.mozilla:rhino:1.7.7.1" + def browserMainImplConfigName = + kotlin.getTargets().getByName("browser").getCompilations().getByName("main").getImplementationConfigurationName() + + add(browserMainImplConfigName, project(":libraryProject")) + add(browserMainImplConfigName, "org.jetbrains.kotlin:kotlin-stdlib-js") + add(browserMainImplConfigName, "org.mozilla:rhino:1.7.7.1") } tasks.named('compileKotlinBrowser') {