Switch to Java 17

kordlib · Jun 21, 2024 · f3ddc54 · f3ddc54
1 parent a84a36e
commit f3ddc54
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 61 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,9 @@
+import dev.kord.gradle.tools.KordExtension
 import dev.kord.gradle.tools.KordGradlePlugin
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.jetbrains.dokka")
@@ -31,6 +33,10 @@ tasks {
 subprojects {
     afterEvaluate {
         apply<KordGradlePlugin>()
+        configure<KordExtension> {
+            publicationName = "mavenCentral"
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     group = rootProject.group
 

diff --git a/buildSrc/src/main/kotlin/lavalink-jvm-module.gradle.kts b/buildSrc/src/main/kotlin/lavalink-jvm-module.gradle.kts
@@ -14,6 +14,7 @@ repositories {
 }
 
 kotlin {
+    jvmToolchain(17)
     explicitApi()
 
     sourceSets {
@@ -30,12 +31,12 @@ kotlin {
     }
 
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_1_8
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 tasks {

diff --git a/buildSrc/src/main/kotlin/lavalink-module.gradle.kts b/buildSrc/src/main/kotlin/lavalink-module.gradle.kts
@@ -17,12 +17,7 @@ repositories {
 kotlin {
     explicitApi()
 
-    jvm {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_1_8
-        }
-    }
+    jvm()
 
     // See https://github.com/DRSchlaubi/Lavakord/issues/2
     js(IR) {

diff --git a/gradle.properties b/gradle.properties
@@ -6,3 +6,4 @@ kotlin.mpp.stability.nowarn=true
 SONATYPE_CONNECT_TIMEOUT_SECONDS=300
 nextPlannedVersion=6.4.0
 kotlinx.atomicfu.enableJvmIrTransformation=true
+kotlinx.atomicfu.enableJsIrTransformation=true
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=17
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinJvm
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     `lavalink-jvm-module`
@@ -17,16 +16,6 @@ dependencies {
 }
 
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_11
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
 mavenPublishing {
     configure(KotlinJvm(JavadocJar.Dokka("dokkaHtml")))
 }
diff --git a/jda-java/build.gradle.kts b/jda-java/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinJvm
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     `lavalink-jvm-module`
@@ -12,16 +11,6 @@ dependencies {
     api(projects.java)
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_11
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
 mavenPublishing {
     configure(KotlinJvm(JavadocJar.Dokka("dokkaHtml")))
 }
diff --git a/plugins/lavasearch/build.gradle.kts b/plugins/lavasearch/build.gradle.kts
@@ -11,16 +11,6 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        compilations.all {
-            compileTaskProvider.configure {
-                compilerOptions {
-                    jvmTarget = JvmTarget.JVM_11
-                }
-            }
-        }
-    }
-
     sourceSets {
         all {
             languageSettings.optIn("kotlin.contracts.ExperimentalContracts")

diff --git a/plugins/lavasrc/build.gradle.kts b/plugins/lavasrc/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        compilations.all {
-            compileTaskProvider.configure {
-                compilerOptions {
-                    jvmTarget = JvmTarget.JVM_11
-                }
-            }
-        }
-    }
-
     sourceSets {
         all {
             languageSettings.optIn("kotlin.contracts.ExperimentalContracts")

diff --git a/plugins/lyrics/build.gradle.kts b/plugins/lyrics/build.gradle.kts
@@ -10,16 +10,6 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        compilations.all {
-            compileTaskProvider.configure {
-                compilerOptions {
-                    jvmTarget = JvmTarget.JVM_11
-                }
-            }
-        }
-    }
-
     sourceSets {
         all {
             languageSettings.optIn("kotlin.contracts.ExperimentalContracts")