From 0c3cb09be200c04eb6fc405eff60d77e6b4b87ed Mon Sep 17 00:00:00 2001 From: DerEchtePilz <81232921+DerEchtePilz@users.noreply.github.com> Date: Fri, 29 Nov 2024 18:16:45 +0100 Subject: [PATCH] Use Java 21 --- commandapi-documentation-code/build.gradle.kts | 9 +++++---- commandapi-documentation-velocity-code/build.gradle.kts | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/commandapi-documentation-code/build.gradle.kts b/commandapi-documentation-code/build.gradle.kts index ec36e29..282f631 100644 --- a/commandapi-documentation-code/build.gradle.kts +++ b/commandapi-documentation-code/build.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.kotlin.config.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile /* @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` `maven-publish` - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "2.1.0" } repositories { @@ -51,7 +51,8 @@ dependencies { group = "dev.jorel" version = "9.6.2-SNAPSHOT" description = "commandapi-documentation-code" -java.sourceCompatibility = JavaVersion.VERSION_16 +java.sourceCompatibility = JavaVersion.VERSION_21 +java.targetCompatibility = JavaVersion.VERSION_21 java { withSourcesJar() @@ -63,7 +64,7 @@ tasks.withType() { } tasks.withType { - kotlinOptions.jvmTarget = "16" + compilerOptions.jvmTarget = JvmTarget.JVM_21 } tasks.withType() { diff --git a/commandapi-documentation-velocity-code/build.gradle.kts b/commandapi-documentation-velocity-code/build.gradle.kts index ed2f902..192fa15 100644 --- a/commandapi-documentation-velocity-code/build.gradle.kts +++ b/commandapi-documentation-velocity-code/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile /* @@ -7,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` `maven-publish` - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "2.1.0" } repositories { @@ -40,7 +41,8 @@ dependencies { group = "dev.jorel" version = "9.6.2-SNAPSHOT" description = "commandapi-documentation-velocity-code" -java.sourceCompatibility = JavaVersion.VERSION_16 +java.sourceCompatibility = JavaVersion.VERSION_21 +java.targetCompatibility = JavaVersion.VERSION_21 java { withSourcesJar() @@ -52,7 +54,7 @@ tasks.withType() { } tasks.withType { - kotlinOptions.jvmTarget = "16" + compilerOptions.jvmTarget = JvmTarget.JVM_21 } tasks.withType() {