Skip to content

Commit 779f0b1

Browse files
committed
resolve conflicts
1 parent 70d4763 commit 779f0b1

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

examples/kotlin-multiplatform/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import kotlinx.benchmark.gradle.JsBenchmarksExecutor
55

66
plugins {
77
kotlin("multiplatform")
8-
kotlin("plugin.allopen") version "1.8.21"
8+
kotlin("plugin.allopen") version "1.9.0"
99
id("org.jetbrains.kotlinx.benchmark")
1010
}
1111

examples/kotlin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
88
plugins {
99
java
1010
kotlin("jvm")
11-
kotlin("plugin.allopen") version "1.8.21"
11+
kotlin("plugin.allopen") version "1.9.0"
1212
id("org.jetbrains.kotlinx.benchmark")
1313
}
1414

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
group=org.jetbrains.kotlinx
22
version=0.5.0-SNAPSHOT
33

4-
kotlin_version=1.8.21
4+
kotlin_version=1.9.0
55
jmhVersion=1.21
6-
infra_version=0.3.0-dev-73
6+
infra_version=0.3.0-dev-74
77
kotlin.code.style=official
88
kotlin.incremental.multiplatform=true
99
kotlin.native.distribution.type=prebuilt

plugin/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
group=org.jetbrains.kotlinx
22
version=0.5.0-SNAPSHOT
33

4-
kotlin_version=1.8.21
4+
kotlin_version=1.9.0
55
jmhVersion=1.21
6-
infra_version=0.3.0-dev-73
6+
infra_version=0.3.0-dev-74
77

88
kotlin.code.style=official

plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class BenchmarksPlugin : Plugin<Project> {
3737

3838
plugins.withType(org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin::class.java) { kotlinPlugin ->
3939
logger.info("Detected Kotlin plugin version '${kotlinPlugin.pluginVersion}'")
40-
if (!getKotlinVersion(kotlinPlugin.pluginVersion).isAtLeast(1, 7, 20)) {
41-
logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.7.20 or higher")
40+
if (!getKotlinVersion(kotlinPlugin.pluginVersion).isAtLeast(1, 9, 0)) {
41+
logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.9.0 or higher")
4242
}
4343
}
4444

0 commit comments

Comments
 (0)