Merge pull request #161 from Kotlin/bobova/migrateCommits

Bobova/migrate commits

Author: woainikk

buildSrc/build.gradle.kts

@@ -8,7 +8,3 @@ plugins {
 repositories {
     mavenCentral()
 }
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}

examples/kotlin-kts/build.gradle.kts

@@ -25,6 +25,12 @@ dependencies {
     implementation(project(":kotlinx-benchmark-runtime"))
 }
 
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}
+
+
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = "1.8"

examples/kotlin-multiplatform/build.gradle

@@ -17,8 +17,11 @@ kotlin {
     jvm {
         compilations.create('benchmark') { associateWith(compilations.main) }
     }
-    js('jsIr', IR) { nodejs() }
-    js('jsIrBuiltIn', IR) { nodejs() }
+    js(IR) {
+        nodejs()
+        compilations.create("defaultExecutor") { associateWith(compilations.main) }
+        compilations.create("builtInExecutor") { associateWith(compilations.main) }
+    }
     wasm('wasmJs') { d8() }
     if (HostManager.host == KonanTarget.MACOS_X64.INSTANCE) macosX64('native')
     if (HostManager.host == KonanTarget.MACOS_ARM64.INSTANCE) macosArm64('native')
@@ -43,8 +46,8 @@ kotlin {
         wasmJsMain {}
 
         jsMain {
-            jsIrMain.dependsOn(it)
-            jsIrBuiltInMain.dependsOn(it)
+            jsDefaultExecutor.dependsOn(it)
+            jsBuiltInExecutor.dependsOn(it)
         }
 
         nativeMain {
@@ -113,8 +116,8 @@ benchmark {
         register("jvmBenchmark") {
             jmhVersion = "1.21"
         }
-        register("jsIr")
-        register("jsIrBuiltIn") {
+        register("jsDefaultExecutor")
+        register("jsBuiltInExecutor") {
             jsBenchmarksExecutor = JsBenchmarksExecutor.BuiltIn
         }
         register("wasmJs")

examples/kotlin/build.gradle

@@ -21,6 +21,10 @@ sourceSets.all {
     java.srcDirs = ["$it.name/src"]
     resources.srcDirs = ["$it.name/resources"]
 }
+compileJava {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}
 
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"

runtime/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
 }
@@ -101,3 +103,10 @@ if (project.findProperty("publication_repository") == "space") {
         }
     }
 }
+
+// Workaround for TeamCity build failure:
+// Task 'compileTestKotlinLinuxX64' uses this output of task 'signLinuxX64Publication' without declaring an explicit or implicit dependency.
+// TODO: Find out and fix the issue
+tasks.withType(KotlinNativeCompile).matching { it.name.toLowerCase().contains("test") }.configureEach {
+    it.dependsOn(tasks.withType(Sign))
+}