Merge pull request #157 from Kotlin/rr/mg/migration-20-master

Changes for 2.0 migration [master branch]

Author: woainikk

runtime/build.gradle

@@ -66,6 +66,7 @@ kotlin {
             }
         }
         jvmMain {
+            dependsOn(commonMain)
             dependencies {
                 compileOnly "org.openjdk.jmh:jmh-core:$jmhVersion"
             }
@@ -76,6 +77,7 @@ kotlin {
             }
         }
         jsMain {
+            dependsOn(commonMain)
             jsIrMain.dependsOn(it)
         }
         nativeMain {

runtime/commonMain/src/kotlinx/benchmark/CommonBenchmarkAnnotations.kt

@@ -77,7 +77,10 @@ fun BenchmarkTimeUnit.toSecondsMultiplier() = when (this) {
 
 @Target(AnnotationTarget.CLASS)
 expect annotation class Warmup(
-    val iterations: Int = -1
+    val iterations: Int = -1,
+    val time: Int = -1,
+    val timeUnit: BenchmarkTimeUnit = BenchmarkTimeUnit.SECONDS,
+    val batchSize: Int = -1
 )
 
 @Target(AnnotationTarget.CLASS)

runtime/jsMain/src/kotlinx/benchmark/JsBenchmarkAnnotations.kt

@@ -26,7 +26,10 @@ actual enum class BenchmarkTimeUnit {
 
 @Target(AnnotationTarget.CLASS)
 actual annotation class Warmup(
-    actual val iterations: Int
+    actual val iterations: Int,
+    actual val time: Int,
+    actual val timeUnit: BenchmarkTimeUnit,
+    actual val batchSize: Int
 )
 
 @Target(AnnotationTarget.CLASS)

runtime/jvmMain/src/kotlinx/benchmark/JvmBenchmarkAnnotations.kt

@@ -20,7 +20,6 @@ actual typealias OutputTimeUnit = org.openjdk.jmh.annotations.OutputTimeUnit
 @Suppress("ACTUAL_WITHOUT_EXPECT")
 actual typealias BenchmarkTimeUnit = java.util.concurrent.TimeUnit
 
-@Suppress("ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE", "NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias Warmup = org.openjdk.jmh.annotations.Warmup
 
 @Suppress("ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE")

runtime/nativeMain/src/kotlinx/benchmark/NativeBenchmarkAnnotations.kt

@@ -30,7 +30,10 @@ actual enum class BenchmarkTimeUnit {
 
 @Target(AnnotationTarget.CLASS)
 actual annotation class Warmup(
-    actual val iterations: Int
+    actual val iterations: Int,
+    actual val time: Int,
+    actual val timeUnit: BenchmarkTimeUnit,
+    actual val batchSize: Int
 )
 
 @Target(AnnotationTarget.CLASS)

runtime/wasmJsMain/src/kotlinx/benchmark/WasmBenchmarkAnnotations.kt

@@ -26,7 +26,10 @@ actual enum class BenchmarkTimeUnit {
 
 @Target(AnnotationTarget.CLASS)
 actual annotation class Warmup(
-    actual val iterations: Int
+    actual val iterations: Int,
+    actual val time: Int,
+    actual val timeUnit: BenchmarkTimeUnit,
+    actual val batchSize: Int
 )
 
 @Target(AnnotationTarget.CLASS)