Merge branch 'main' into member-profile-rule

# Conflicts: # rest/api/rest.klib.api
kordlib · Sep 10, 2024 · a603182 · a603182
2 parents 6668dff + 4f6712f
commit a603182
Show file tree

Hide file tree

Showing 39 changed files with 218 additions and 389 deletions.
diff --git a/.github/workflows/deployment-ci.yml b/.github/workflows/deployment-ci.yml
@@ -27,9 +27,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 21
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew --stacktrace --info build
   release:
@@ -54,9 +54,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 21
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew --stacktrace --info build
       - name: Publish with Gradle

diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml
@@ -23,9 +23,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 21
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Build docs with Gradle
         run: ./gradlew --stacktrace --info dokkaHtmlMultiModule
       - name: Deploy docs to GitHub Pages

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/buildSrc/src/main/kotlin/Compiler.kt b/buildSrc/src/main/kotlin/Compiler.kt
@@ -1,6 +1,8 @@
 import org.gradle.api.NamedDomainObjectSet
 import org.gradle.kotlin.dsl.assign
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 
 val kordOptIns = listOf(
@@ -12,16 +14,20 @@ val kordOptIns = listOf(
     "dev.kord.common.annotation.KordVoice",
 )
 
-object Jvm {
-    const val target = 8
-}
-
-fun KotlinCommonCompilerOptions.applyKordCompilerOptions() {
+internal fun KotlinCommonCompilerOptions.applyKordCommonCompilerOptions() {
     allWarningsAsErrors = true
     progressiveMode = true
     freeCompilerArgs.add("-Xexpect-actual-classes")
 }
 
+internal const val KORD_JVM_TARGET = 8
+
+internal fun KotlinJvmCompilerOptions.applyKordJvmCompilerOptions() {
+    applyKordCommonCompilerOptions()
+    jvmTarget = JVM_1_8
+    freeCompilerArgs.add("-Xjdk-release=1.8")
+}
+
 internal fun NamedDomainObjectSet<KotlinSourceSet>.applyKordTestOptIns() {
     named { it.contains("test", ignoreCase = true) }.configureEach {
         // allow `ExperimentalCoroutinesApi` for `TestScope.currentTime`

diff --git a/buildSrc/src/main/kotlin/Documentation.kt b/buildSrc/src/main/kotlin/Documentation.kt
@@ -10,7 +10,7 @@ fun AbstractDokkaLeafTask.applyKordDokkaOptions() {
 
     dokkaSourceSets.configureEach {
 
-        jdkVersion = Jvm.target
+        jdkVersion = 22
 
         suppressGeneratedFiles = false
 

diff --git a/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-module.gradle.kts
@@ -7,8 +7,13 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain(Jvm.target)
     compilerOptions {
-        applyKordCompilerOptions()
+        applyKordJvmCompilerOptions()
+    }
+}
+
+tasks {
+    withType<JavaCompile>().configureEach {
+        options.release = KORD_JVM_TARGET
     }
 }
diff --git a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts
@@ -8,18 +8,21 @@ repositories {
     mavenCentral()
 }
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
-    jvm()
+    compilerOptions {
+        applyKordCommonCompilerOptions()
+    }
+
+    jvm {
+        compilerOptions {
+            applyKordJvmCompilerOptions()
+        }
+    }
     js {
         nodejs()
         useCommonJs()
     }
-    jvmToolchain(Jvm.target)
-
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    compilerOptions {
-        applyKordCompilerOptions()
-    }
 }
 
 tasks {

diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts
@@ -24,11 +24,8 @@ apiValidation {
 
 kotlin {
     explicitApi()
-
-    jvmToolchain(Jvm.target)
-
     compilerOptions {
-        applyKordCompilerOptions()
+        applyKordJvmCompilerOptions()
         optIn.addAll(kordOptIns)
     }
 
@@ -45,6 +42,10 @@ tasks {
     withType<AbstractDokkaLeafTask>().configureEach {
         applyKordDokkaOptions()
     }
+
+    withType<JavaCompile>().configureEach {
+        options.release = KORD_JVM_TARGET
+    }
 }
 
 publishing {

diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -23,10 +23,19 @@ apiValidation {
     applyKordBCVOptions()
 }
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     explicitApi()
+    compilerOptions {
+        applyKordCommonCompilerOptions()
+        optIn.addAll(kordOptIns)
+    }
 
-    jvm()
+    jvm {
+        compilerOptions {
+            applyKordJvmCompilerOptions()
+        }
+    }
     js {
         nodejs {
             testTask {
@@ -39,13 +48,6 @@ kotlin {
         }
         useCommonJs()
     }
-    jvmToolchain(Jvm.target)
-
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    compilerOptions {
-        applyKordCompilerOptions()
-        optIn.addAll(kordOptIns)
-    }
 
     applyDefaultHierarchyTemplate()