From 58a40a53cdcea9cafcc0c3fc3229d7e0c075c7ad Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 24 Apr 2023 16:25:42 +0200 Subject: [PATCH] Enable -Xjvm-default=all for benchmarks And remove usages of JvmDefault, which is going to be deprecated with error in KT-54746. --- benchmarks/build.gradle.kts | 2 +- .../kotlin/benchmarks/flow/scrabble/ShakespearePlaysScrabble.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index b4629809db..e64f18905f 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -24,7 +24,7 @@ java { tasks.named("compileJmhKotlin") { kotlinOptions { jvmTarget = "1.8" - freeCompilerArgs += "-Xjvm-default=enable" + freeCompilerArgs += "-Xjvm-default=all" } } diff --git a/benchmarks/src/jmh/kotlin/benchmarks/flow/scrabble/ShakespearePlaysScrabble.kt b/benchmarks/src/jmh/kotlin/benchmarks/flow/scrabble/ShakespearePlaysScrabble.kt index 006d36c04b..10433fcb45 100644 --- a/benchmarks/src/jmh/kotlin/benchmarks/flow/scrabble/ShakespearePlaysScrabble.kt +++ b/benchmarks/src/jmh/kotlin/benchmarks/flow/scrabble/ShakespearePlaysScrabble.kt @@ -34,14 +34,12 @@ abstract class ShakespearePlaysScrabble { public interface LongWrapper { fun get(): Long - @JvmDefault fun incAndSet(): LongWrapper { return object : LongWrapper { override fun get(): Long = this@LongWrapper.get() + 1L } } - @JvmDefault fun add(other: LongWrapper): LongWrapper { return object : LongWrapper { override fun get(): Long = this@LongWrapper.get() + other.get()