resolve conflicts

Kotlin · Sep 12, 2023 · 779f0b1 · 779f0b1
1 parent 70d4763
commit 779f0b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/examples/kotlin-multiplatform/build.gradle.kts b/examples/kotlin-multiplatform/build.gradle.kts
@@ -5,7 +5,7 @@ import kotlinx.benchmark.gradle.JsBenchmarksExecutor
 
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.allopen") version "1.8.21"
+    kotlin("plugin.allopen") version "1.9.0"
     id("org.jetbrains.kotlinx.benchmark")
 }
 

diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
 plugins {
     java
     kotlin("jvm")
-    kotlin("plugin.allopen") version "1.8.21"
+    kotlin("plugin.allopen") version "1.9.0"
     id("org.jetbrains.kotlinx.benchmark")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.jetbrains.kotlinx
 version=0.5.0-SNAPSHOT
 
-kotlin_version=1.8.21
+kotlin_version=1.9.0
 jmhVersion=1.21
-infra_version=0.3.0-dev-73
+infra_version=0.3.0-dev-74
 kotlin.code.style=official
 kotlin.incremental.multiplatform=true
 kotlin.native.distribution.type=prebuilt

diff --git a/plugin/gradle.properties b/plugin/gradle.properties
@@ -1,8 +1,8 @@
 group=org.jetbrains.kotlinx
 version=0.5.0-SNAPSHOT
 
-kotlin_version=1.8.21
+kotlin_version=1.9.0
 jmhVersion=1.21
-infra_version=0.3.0-dev-73
+infra_version=0.3.0-dev-74
 
 kotlin.code.style=official
diff --git a/plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt b/plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt
@@ -37,8 +37,8 @@ class BenchmarksPlugin : Plugin<Project> {
 
         plugins.withType(org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin::class.java) { kotlinPlugin ->
             logger.info("Detected Kotlin plugin version '${kotlinPlugin.pluginVersion}'")
-            if (!getKotlinVersion(kotlinPlugin.pluginVersion).isAtLeast(1, 7, 20)) {
-                logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.7.20 or higher")
+            if (!getKotlinVersion(kotlinPlugin.pluginVersion).isAtLeast(1, 9, 0)) {
+                logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.9.0 or higher")
             }
         }