Target JVM 17 with APIs

DRSchlaubi · Nov 9, 2024 · d23adfe · d23adfe
1 parent 29169f6
commit d23adfe
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 1 deletion.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "2.1.0"
+    version = "2.1.1"
 
     repositories {
         mavenCentral()

diff --git a/buildSrc/src/main/kotlin/published-module.gradle.kts b/buildSrc/src/main/kotlin/published-module.gradle.kts
@@ -1,5 +1,7 @@
 import org.gradle.kotlin.dsl.`maven-publish`
 import org.gradle.kotlin.dsl.signing
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 import java.util.Base64
 
 plugins {

diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -1,5 +1,9 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
 import dev.schlaubi.tonbrett.gradle.androidSdk
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
     `multiplatform-module`
@@ -12,6 +16,11 @@ repositories {
 }
 
 kotlin {
+    targets.named<KotlinJvmTarget>("desktop") {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
+    }
     macosArm64()
     macosX64()
     mingwX64()

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,4 +1,10 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
 import dev.schlaubi.tonbrett.gradle.androidSdk
+import org.gradle.kotlin.dsl.named
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
     `multiplatform-module`
@@ -7,6 +13,11 @@ plugins {
 }
 
 kotlin {
+    targets.named<KotlinJvmTarget>("desktop") {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
+    }
     explicitApi()
 
     macosArm64()

diff --git a/lavalink-plugin/build.gradle.kts b/lavalink-plugin/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm")
     alias(libs.plugins.lavalink)
@@ -10,6 +12,16 @@ dependencies {
     implementation(libs.kord.common)
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
 lavalinkPlugin {
     name = "tonbrett"
     apiVersion = libs.versions.lavalink.api