fix: ssvm for JDK 20+

skidfuscatordev · Dec 17, 2024 · 43bb9fb · 43bb9fb
1 parent 547b874
commit 43bb9fb
Show file tree

Hide file tree

Showing 19 changed files with 2,418 additions and 45 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,6 +11,9 @@ allprojects {
         maven {
             url 'https://repo.cleanroommc.com/releases/'
         }
+        maven {
+            url 'https://jitpack.io'
+        }
     }
 
     apply plugin: 'java'
@@ -20,8 +23,8 @@ allprojects {
     targetCompatibility = 1.8
 
     dependencies {
-        compileOnly 'org.projectlombok:lombok:1.18.24'
-        annotationProcessor 'org.projectlombok:lombok:1.18.24'
+        compileOnly 'org.projectlombok:lombok:1.18.36'
+        annotationProcessor 'org.projectlombok:lombok:1.18.36'
 
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
         testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
@@ -30,6 +33,15 @@ allprojects {
     compileJava {
         options.encoding = "UTF-8" // Will fail on the non-ascii comments if not set
     }
+
+    ext {
+        asm = 'org.ow2.asm:asm:9.7.1'
+        asm_commons = 'org.ow2.asm:asm-commons:9.7.1'
+        asm_tree = 'org.ow2.asm:asm-tree:9.7.1'
+        cafedude = 'com.github.Col-E:CAFED00D:2.1.1'
+        slf4j_api = 'org.slf4j:slf4j-api:1.7.36'
+        jlinker = 'com.github.xxDark:jlinker:1.0.7'
+    }
 }
 
 group 'dev.skidfuscator.community'

diff --git a/dev.skidfuscator.commons/build.gradle b/dev.skidfuscator.commons/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     api 'com.typesafe:config:1.4.2'
-    compileOnly 'org.projectlombok:lombok:1.18.24'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
 
     api project(":annotations")
     api project(':main')

diff --git a/dev.skidfuscator.obfuscator.pureanalysis/build.gradle b/dev.skidfuscator.obfuscator.pureanalysis/build.gradle
@@ -8,11 +8,15 @@ version = '2.0.0-SNAPSHOT'
 repositories {
     mavenCentral()
     maven { url 'https://jitpack.io' }
+    mavenLocal()
 }
 
 dependencies {
     api project(':modasm')
-    api 'com.github.terminalsin:SSVM:dev-SNAPSHOT'
+    //api 'io.github.terminalsin:SSVM:dev-SNAPSHOT'
+    api 'dev.xdark:ssvm-core:2.0.2'
+    api 'dev.xdark:ssvm-invoke:2.0.2'
+    api 'dev.xdark:ssvm-io:2.0.2'
 
     testImplementation platform('org.junit:junit-bom:5.10.0')
     testImplementation 'org.junit.jupiter:junit-jupiter'

diff --git a/dev.skidfuscator.obfuscator/build.gradle b/dev.skidfuscator.obfuscator/build.gradle
@@ -13,8 +13,8 @@ configurations {
 }
 
 dependencies {
-    testCompileOnly 'org.projectlombok:lombok:1.18.24'
-    compileOnly 'org.projectlombok:lombok:1.18.24'
+    testCompileOnly 'org.projectlombok:lombok:1.18.36'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
 
     api project(':commons')
     api project(':pure-analysis')
@@ -24,8 +24,9 @@ dependencies {
     api 'com.github.Col-E:jphantom:1.4.3'
     implementation 'dev.dirs:directories:26'
     implementation 'de.femtopedia.dex2jar:dex2jar:2.4.24'
+    implementation 'org.apache.commons:commons-compress:1.24.0'
 
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.36'
     implementation 'org.fusesource.jansi:jansi:2.4.0'
     implementation 'org.yaml:snakeyaml:1.33'