Skip to content

Commit 2847cdc

Browse files
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 <wangzongler@gmail.com>
1 parent a4cf96b commit 2847cdc

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/build/
22
**/.gradle/
33
.idea/
4+
.kotlin/
45
*.iml
56
*.ipr
67
*.iws

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ tasks.rat {
7272
add("**/build/**")
7373
add(".github/**")
7474
add(".idea/**")
75+
add(".kotlin/**")
7576
add("**/*.iws")
7677
add("**/*.iml")
7778
add("**/*.ipr")

src/funcTest/groovy/me/champeau/jmh/MultiLanguageSpec.groovy

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package me.champeau.jmh
1717

18-
18+
import org.gradle.util.GradleVersion
1919
import spock.lang.Unroll
2020

2121
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
@@ -41,7 +41,11 @@ class MultiLanguageSpec extends AbstractFuncSpec {
4141
[language, gradleVersion] << [
4242
['Groovy', 'Java', 'Kotlin', 'Scala'],
4343
TESTED_GRADLE_VERSIONS
44-
].combinations()
44+
].combinations().findAll { lang, gradleVer ->
45+
// TODO: remove this condition when TESTED_GRADLE_VERSIONS gets updated to 7.6.3 or higher.
46+
// 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
47+
!(lang == 'Kotlin' && gradleVer < GradleVersion.version('7.6.3'))
48+
}
4549
}
4650
4751
def "Executes benchmarks with multiple languages"() {

src/funcTest/resources/kotlin-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10'
21+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0'
2222
}
2323
}
2424

0 commit comments

Comments
 (0)