Fix build failures caused by -Werror

Kotlin · Sep 4, 2024 · 9eff807 · 9eff807
1 parent 257a0b2
commit 9eff807
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/examples/kotlin-multiplatform/build.gradle b/examples/kotlin-multiplatform/build.gradle
@@ -32,7 +32,10 @@ kotlin {
 
     targets.configureEach {
         compilations.configureEach {
-            kotlinOptions.allWarningsAsErrors = true
+            // TODO: Uncomment before merging to master. Currently, K1 produced warning for progressiveMode:
+            //  w: '-progressive' is meaningful only for the latest language version (2.0), while this build uses 1.9
+            //  Compiler behavior in such mode is undefined; please, consider moving to the latest stable version or turning off progressive mode.
+//            kotlinOptions.allWarningsAsErrors = true
         }
     }
 

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -56,7 +56,10 @@ kotlin {
     targets.configureEach {
         compilations.configureEach {
             compilerOptions.options.with {
-                allWarningsAsErrors.set(true)
+                // TODO: Uncomment before merging to master. Currently, K2 produced warning for suppressing
+                //  NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS and ACTUAL_WITHOUT_EXPECT, which are redundant in K2.
+                //  However, the suppresses are still relevant in K1.
+//                allWarningsAsErrors.set(true)
                 freeCompilerArgs.add("-Xexpect-actual-classes")
                 optIn.addAll(
                         "kotlinx.benchmark.internal.KotlinxBenchmarkRuntimeInternalApi",

diff --git a/runtime/jvmMain/src/kotlinx/benchmark/JvmBenchmarkAnnotations.kt b/runtime/jvmMain/src/kotlinx/benchmark/JvmBenchmarkAnnotations.kt
@@ -10,13 +10,17 @@ actual typealias TearDown = org.openjdk.jmh.annotations.TearDown
 
 actual typealias Benchmark = org.openjdk.jmh.annotations.Benchmark
 
+// TODO: This annotation is redundant in K2: KT-59561
+//  K2 currently produces warning for its use.
 @Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias BenchmarkMode = org.openjdk.jmh.annotations.BenchmarkMode
 
 actual typealias Mode = org.openjdk.jmh.annotations.Mode
 
 actual typealias OutputTimeUnit = org.openjdk.jmh.annotations.OutputTimeUnit
 
+// TODO: This annotation is redundant in K2: KT-59561
+//  K2 currently produces warning for its use.
 @Suppress("ACTUAL_WITHOUT_EXPECT")
 actual typealias BenchmarkTimeUnit = java.util.concurrent.TimeUnit
 
@@ -25,5 +29,7 @@ actual typealias Warmup = org.openjdk.jmh.annotations.Warmup
 @Suppress("ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE")
 actual typealias Measurement = org.openjdk.jmh.annotations.Measurement
 
+// TODO: This annotation is redundant in K2: KT-59561
+//  K2 currently produces warning for its use.
 @Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS")
 actual typealias Param = org.openjdk.jmh.annotations.Param