Update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v2.1.0

* Update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v2.1.0 * Update MultiLanguageSpec.groovy * Ignore .kotlin --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zongle Wang <[email protected]>
melix · Jan 21, 2025 · 2847cdc · 2847cdc
1 parent a4cf96b
commit 2847cdc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 **/build/
 **/.gradle/
 .idea/
+.kotlin/
 *.iml
 *.ipr
 *.iws

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -72,6 +72,7 @@ tasks.rat {
         add("**/build/**")
         add(".github/**")
         add(".idea/**")
+        add(".kotlin/**")
         add("**/*.iws")
         add("**/*.iml")
         add("**/*.ipr")

diff --git a/src/funcTest/groovy/me/champeau/jmh/MultiLanguageSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/MultiLanguageSpec.groovy
@@ -15,7 +15,7 @@
  */
 package me.champeau.jmh
 
-
+import org.gradle.util.GradleVersion
 import spock.lang.Unroll
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
@@ -41,7 +41,11 @@ class MultiLanguageSpec extends AbstractFuncSpec {
         [language, gradleVersion] << [
                 ['Groovy', 'Java', 'Kotlin', 'Scala'],
                 TESTED_GRADLE_VERSIONS
-        ].combinations()
+        ].combinations().findAll { lang, gradleVer ->
+            // TODO: remove this condition when TESTED_GRADLE_VERSIONS gets updated to 7.6.3 or higher.
+            // Kotlin 2.1.0 requires the minimum Gradle version 7.6.3, see https://kotlinlang.org/docs/gradle-configure-project.html#kotlin-gradle-plugin-data-in-a-project
+            !(lang == 'Kotlin' && gradleVer < GradleVersion.version('7.6.3'))
+        }
     }
 
     def "Executes benchmarks with multiple languages"() {

diff --git a/src/funcTest/resources/kotlin-project/build.gradle b/src/funcTest/resources/kotlin-project/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0'
     }
 }