From f3ddc546cb1cadffc4524aa8864475f7e516dda9 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Fri, 21 Jun 2024 21:10:38 +0200
Subject: [PATCH] Switch to Java 17

---
 .idea/compiler.xml                                    |  2 +-
 .idea/vcs.xml                                         |  5 +++++
 build.gradle.kts                                      |  6 ++++++
 .../src/main/kotlin/lavalink-jvm-module.gradle.kts    |  5 +++--
 buildSrc/src/main/kotlin/lavalink-module.gradle.kts   |  7 +------
 gradle.properties                                     |  1 +
 gradle/gradle-daemon-jvm.properties                   |  2 ++
 java/build.gradle.kts                                 | 11 -----------
 jda-java/build.gradle.kts                             | 11 -----------
 plugins/lavasearch/build.gradle.kts                   | 10 ----------
 plugins/lavasrc/build.gradle.kts                      | 10 ----------
 plugins/lyrics/build.gradle.kts                       | 10 ----------
 12 files changed, 19 insertions(+), 61 deletions(-)
 create mode 100644 gradle/gradle-daemon-jvm.properties

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 823e381a..32d94a6b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="17" />
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..8d3e42f2 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GitSharedSettings">
+    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
+      <list />
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/build.gradle.kts b/build.gradle.kts
index 3859d0c9..e4398930 100644
--- 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
index 028c0790..184b8923 100644
--- 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
index eb30edf7..4cacce9b 100644
--- 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
index 1e35a592..e8b152e9 100644
--- 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
new file mode 100644
index 00000000..858feb7e
--- /dev/null
+++ 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
index 4931d3bb..c2675818 100644
--- 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
index 68c82588..4c78b8fb 100644
--- 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
index 9718e594..3deace51 100644
--- 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
index b71974d4..c7b93430 100644
--- 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
index 8d05c5a0..9a35764f 100644
--- 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")