Chore: Update Java build version

SeeSharpSoft · Oct 5, 2024 · 9556c28 · 9556c28
1 parent 39e7889
commit 9556c28
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/CIBuild.yml b/.github/workflows/CIBuild.yml
@@ -56,10 +56,10 @@ jobs:
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/.github/workflows/CoverallsReport.yml b/.github/workflows/CoverallsReport.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/.github/workflows/CronEAP.yml b/.github/workflows/CronEAP.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/.github/workflows/PublishStable.yml b/.github/workflows/PublishStable.yml
@@ -20,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml
@@ -23,10 +23,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.gradle.internal.impldep.org.testng.reporters.XMLUtils
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.extensions.intellijPlatform
@@ -35,8 +34,7 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
 sourceSets {
@@ -74,8 +72,9 @@ dependencies {
         zipSigner()
 
         jetbrainsRuntime()
+        javaCompiler("21")
+
         testFramework(TestFrameworkType.Platform)
-        testFramework(TestFrameworkType.JUnit5)
     }
 
     testImplementation("org.mockito:mockito-core:5.14.1")