chore(build): Build for J21

KyoriPowered · Jan 22, 2024 · 55c17c4 · 55c17c4
1 parent 2eef1c4
commit 55c17c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
         id: "setup"
         uses: "KyoriPowered/.github/.github/actions/setup-java-env@trunk"
         with:
-          runtime_version: 17
+          runtime_version: 21
           publishing_branch_regex: 'main'
           gradle_warning_mode: "all"
       - name: "build"

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,7 +21,7 @@ jobs:
         id: "setup"
         uses: "KyoriPowered/.github/.github/actions/setup-java-env@trunk"
         with:
-          runtime_version: 17
+          runtime_version: 21
           publishing_branch_regex: "main"
           gradle_warning_mode: "all"
       - name: "build for production"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 import net.kyori.indra.git.IndraGitExtension
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 
-@Suppress("DSL_SCOPE_VIOLATION") // https://youtrack.jetbrains.com/issue/KTIJ-19369
 plugins {
     application
     alias(libs.plugins.indra.git)
@@ -11,7 +10,7 @@ plugins {
     alias(libs.plugins.spotless)
 }
 
-val javaTarget = 17
+val javaTarget = 21
 java {
     val targetVersion = JavaVersion.toVersion(javaTarget)
     sourceCompatibility = targetVersion

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "adventure-webui"