Skip to content

Commit cb332bc

Browse files
committed
Upgrade Kotlin to version 2.0.0
Kotlin 2.0.0 is the latest version that still supports Kotlin Language version 1.4 which is required for Gradle 7.6 support, see https://docs.gradle.org/current/userguide/compatibility.html#kotlin
1 parent ebb2e81 commit cb332bc

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
15
plugins {
26
// Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
37
`java-gradle-plugin`
@@ -62,6 +66,23 @@ val functionalTest by tasks.registering(Test::class) {
6266

6367
gradlePlugin.testSourceSets.add(functionalTestSourceSet)
6468

69+
tasks.named<JavaCompile>("compileJava") {
70+
targetCompatibility = JvmTarget.JVM_17.target
71+
}
72+
73+
tasks.named<KotlinCompile>("compileKotlin") {
74+
compilerOptions {
75+
optIn = listOf("kotlin.io.path.ExperimentalPathApi")
76+
77+
// See https://docs.gradle.org/current/userguide/compatibility.html#java_runtime.
78+
jvmTarget = JvmTarget.JVM_17
79+
80+
// See https://docs.gradle.org/current/userguide/compatibility.html#kotlin.
81+
languageVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
82+
apiVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
83+
}
84+
}
85+
6586
tasks.named<Task>("check") {
6687
// Run the functional tests as part of `check`
6788
dependsOn(functionalTest)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
assertj = "3.27.3"
33
git-semver-plugin = "0.16.1"
44
jgit = "7.3.0.202506031305-r"
5-
kotlin = "1.9.10"
5+
kotlin = "2.0.0"
66
plugin-publish = "1.3.1"
77
slf4j = "2.0.17"
88

src/main/kotlin/git/semver/plugin/semver/VersionFinder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class VersionFinder(private val settings: SemverSettings, private val tags: Map<
143143
return when {
144144
parentSemVersions.isEmpty() -> versionZero()
145145
parentSemVersions.size == 1 -> parentSemVersions[0]
146-
else -> parentSemVersions.max().mergeChanges(parentSemVersions)
146+
else -> checkNotNull(parentSemVersions.maxOrNull()).mergeChanges(parentSemVersions)
147147
}
148148
}
149149

0 commit comments

Comments
 (0)