Skip to content

Commit 1b8ac5b

Browse files
committed
fix: Compile for Jvm 17, don't set a toolchain
1 parent 45a3877 commit 1b8ac5b

3 files changed

Lines changed: 9 additions & 29 deletions

File tree

build.gradle.kts

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.kotlinJvm)
3-
// alias(libs.plugins.versions)
4-
// alias(libs.plugins.versionCatalogUpdate)
55
}
66

77
allprojects {
@@ -10,34 +10,16 @@ allprojects {
1010
}
1111
}
1212

13-
//versionCatalogUpdate {
14-
// this.keep {
15-
// keepUnusedPlugins = true
16-
// keepUnusedVersions = true
17-
// keepUnusedLibraries = true
18-
// }
19-
//}
20-
21-
//tasks.dependencyUpdates {
22-
// fun isNonStable(version: String): Boolean {
23-
// val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
24-
// val regex = "^[0-9,.v-]+(-r)?$".toRegex()
25-
// val isStable = stableKeyword || regex.matches(version)
26-
// return isStable.not()
27-
// }
28-
// rejectVersionIf {
29-
// isNonStable(candidate.version)
30-
// }
31-
//}
32-
3313
allprojects {
3414
apply(plugin = "kotlin")
3515

16+
// Don't want to set a toolchain because we will be compiling with GraalVM 23 during CI
3617
kotlin {
37-
jvmToolchain(23) // want this for graalvm 23 despite kotlin not supporting yet
18+
compilerOptions.jvmTarget = JvmTarget.JVM_17
3819
}
20+
3921
java {
40-
sourceCompatibility = JavaVersion.VERSION_22
41-
targetCompatibility = JavaVersion.VERSION_22
22+
sourceCompatibility = JavaVersion.VERSION_17
23+
targetCompatibility = JavaVersion.VERSION_17
4224
}
4325
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
group=com.mineinabyss
3-
version=3.1.1
3+
version=3.1.2
44
idofrontVersion=0.25.6

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
clikt = "5.0.1"
33
hocon = "1.4.3"
44
kaml = "0.65.0"
5-
kotlin = "2.0.21"
5+
kotlin = "2.1.0"
66
kotlinx-coroutines = "1.9.0"
77
kotlinx-serialization = "1.7.3"
88
ktor = "3.0.1"
@@ -27,5 +27,3 @@ graalvm-nativeimage = "org.graalvm.buildtools.native:0.10.3"
2727
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2828
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
2929
shadow = "com.gradleup.shadow:8.3.5"
30-
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.5"
31-
versions = "com.github.ben-manes.versions:0.51.0"

0 commit comments

Comments
 (0)