Update to JDK21

FAForever · Feb 29, 2024 · de09e17 · de09e17
1 parent 967898a
commit de09e17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,10 +3,14 @@ on: [push]
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: adoptopenjdk:11-jdk-hotspot-bionic
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Gradle build
         env:
           GRADLE_CLI_OPTS: ""

diff --git a/build.gradle b/build.gradle
@@ -89,8 +89,8 @@ subprojects {
   group = 'com.faforever.commons'
   version = '1.0-SNAPSHOT'
 
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 
   repositories {
     mavenCentral()

diff --git a/faf-commons-lobby/build.gradle.kts b/faf-commons-lobby/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 version = "1.0.0-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 dependencies {
   api(libs.reactor.core)
@@ -40,6 +40,6 @@ tasks.withType<Test> {
 tasks.withType<KotlinCompile> {
   kotlinOptions {
     freeCompilerArgs = listOf("-Xjsr305=strict")
-    jvmTarget = "11"
+    jvmTarget = "21"
   }
 }
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,4 +1,4 @@
 jdk:
-  - openjdk11
+  - openjdk21
 before_install:
   - sdk install kotlin