fix: win11 support and ci fix

skidfuscatordev · Dec 18, 2024 · de51ce1 · de51ce1
1 parent 18d4aae
commit de51ce1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/dev.skidfuscator.client.standalone/build.gradle b/dev.skidfuscator.client.standalone/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'application'
+    id 'xyz.wagyourtail.jvmdowngrader' version '1.2.1'
 }
 repositories {
     mavenCentral()
@@ -11,6 +12,14 @@ application {
     mainClass = 'dev.skidfuscator.obfuscator.SkidfuscatorMain'
 }
 
+downgradeJar {
+    downgradeTo = JavaVersion.VERSION_1_8
+}
+
+shadeDowngradedApi {
+    downgradeTo = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     implementation 'info.picocli:picocli:4.6.3'
     implementation 'org.jline:jline:3.21.0'
@@ -25,4 +34,7 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
+
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
diff --git a/dev.skidfuscator.obfuscator/build.gradle b/dev.skidfuscator.obfuscator/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'com.roscopeco.jasm' version "0.7.0"
+    id 'xyz.wagyourtail.jvmdowngrader' version '1.2.1'
 }
 
 repositories {
@@ -49,3 +50,12 @@ test {
 }
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
+
+configurations {
+    downgrade
+    implementation.extendsFrom downgrade
+}
+
+downgradeJar {
+    downgradeTo = JavaVersion.VERSION_1_8
+}
diff --git a/...skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/JdkDownloader.java b/...skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/JdkDownloader.java
@@ -29,6 +29,7 @@ public class JdkDownloader {
                 JDK_URL = "https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-macosx-aarch64.tar.gz";
                 break;
             case "windows":
+            case "windows 11":
                 JDK_URL = "https://download.java.net/java/GA/jdk17.0.2/0d483333a00540d886896a45e7e18309295e7f3a/jdk-17.0.2_windows-x64_bin.zip";
                 break;
             default:

diff --git a/dev.skidfuscator.obfuscator/src/test/resources/config/config.hocon b/dev.skidfuscator.obfuscator/src/test/resources/config/config.hocon
@@ -1,5 +1,5 @@
 exempt: [
-    "class{^dev\\/skidfuscator\\/test}"
+    "class{^dev\\/skidfuscator\\/test}",
 ]
 
 driver: {