Fix wrong commits picked for master: restore changes from KOTLIN-CR-2817

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt

@@ -360,7 +360,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
             assertSuccessful()
 
             assertTasksExecuted(
-                ":compileKotlin", ":compileTestKotlin", ":compileBenchmarkKotlin",
+                ":compileKotlinJs", ":compileTestKotlinJs", ":compileBenchmarkKotlinJs",
                 ":runDceKotlin", ":runDceBenchmarkKotlin"
             )
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts

@@ -13,13 +13,13 @@ repositories {
 }
 
 kotlin.sourceSets {
-    main {
+    getByName("main") {
         dependencies {
             api("org.jetbrains.kotlinx:kotlinx-html-js:0.6.10")
             implementation(kotlin("stdlib-js"))
         }
     }
-    test {
+    getByName("test") {
         dependencies {
             implementation(kotlin("test-js"))
         }
@@ -37,7 +37,7 @@ kotlin.target.compilations.create("benchmark") {
 publishing {
     publications {
         create("default", MavenPublication::class.java) {
-            from(kotlin.target.components.single())
+            from(components.getByName("kotlin"))
             artifact(tasks.getByName("kotlinSourcesJar"))
         }
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/build.gradle.kts

@@ -50,7 +50,7 @@ val runBenchmark by tasks.registering(JavaExec::class) {
 publishing {
     publications {
         create("default", MavenPublication::class) {
-            from(kotlin.target.components.single())
+            from(components.getByName("kotlin"))
             artifact(tasks.getByName("kotlinSourcesJar"))
         }
     }