Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

MohistMC · Oct 19, 2024 · 1da5ea5 · 1da5ea5
2 parents 4810d4e + 95a4972
commit 1da5ea5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'

diff --git a/build.gradle b/build.gradle
@@ -163,10 +163,10 @@ allprojects {
 
 	java {
 		toolchain {
-			languageVersion = JavaLanguageVersion.of(21)
+			languageVersion = JavaLanguageVersion.of(17)
 		}
-		sourceCompatibility = JavaVersion.VERSION_21
-		targetCompatibility = JavaVersion.VERSION_21
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
 	}
 
 	tasks.withType(JavaCompile).configureEach {

diff --git a/src/main/java/com/mohistmc/banner/BannerLauncher.java b/src/main/java/com/mohistmc/banner/BannerLauncher.java
@@ -8,11 +8,11 @@
 
 public class BannerLauncher {
 
-    private static final int MIN_CLASS_VERSION = 65;
-    private static final int MIN_JAVA_VERSION = 21;
+    private static final int MIN_CLASS_VERSION = 61;
+    private static final int MIN_JAVA_VERSION = 17;
 
-    private static final int MAX_CLASS_VERSION = 66;
-    private static final int MAX_JAVA_VERSION = 22;
+    private static final int MAX_CLASS_VERSION = 67;
+    private static final int MAX_JAVA_VERSION = 23;
 
     public static void main(String[] args) throws Throwable {
         int javaVersion = (int) Float.parseFloat(System.getProperty("java.class.version"));