diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml index b373b759f..182f3da40 100644 --- a/.github/actions/setup-env/action.yaml +++ b/.github/actions/setup-env/action.yaml @@ -15,7 +15,7 @@ inputs: java-version: description: Java version. required: false - default: "17" + default: "21" runs: using: "composite" diff --git a/api/build.gradle b/api/build.gradle index 7095daa57..adddf4269 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -9,9 +9,15 @@ plugins { group = 'run.halo.app' description = 'API of halo project, connecting by other projects.' +tasks.withType(JavaCompile).configureEach { + options.release = 21 + options.encoding = 'UTF-8' +} + java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } compileJava.options.encoding = "UTF-8" diff --git a/application/build.gradle b/application/build.gradle index 73f328e9d..d58523af8 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -17,12 +17,16 @@ plugins { } group = 'run.halo.app' -compileJava.options.encoding = 'UTF-8' -compileTestJava.options.encoding = 'UTF-8' + +tasks.withType(JavaCompile).configureEach { + options.release = 21 + options.encoding = 'UTF-8' +} java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } idea {