From cb287e411cad92d067d3d29f6ddaf7b16dda524f Mon Sep 17 00:00:00 2001 From: Shanyu Thibaut Juneja <30368557+terminalsin@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:35:27 -0500 Subject: [PATCH] fix(all): update asm + version tweak --- .../skidfuscator/obfuscator/command/ObfuscateCommand.java | 2 +- .../test/java/dev/skidfuscator/test/SampleJarTest.java | 4 ++-- org.mapleir.parent/org.mapleir.modasm/build.gradle | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java index c77dc2a..50ec32a 100644 --- a/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java +++ b/dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java @@ -141,7 +141,7 @@ public Integer call() { " │ " + topMemory + " │", " └───────────────────────────────────────────┘", "", - " Author: Ghast Version: 2.0.7 Today: " + " Author: Ghast Version: 2.0.8 Today: " + DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())), "" }; diff --git a/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java b/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java index a31c0c8..18a4724 100644 --- a/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java +++ b/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java @@ -72,9 +72,9 @@ public void test2() throws Exception { System.out.println(skidfuscator.getClassRemapper()); final String name = skidfuscator .getClassRemapper() - .map(Type.getObjectType("dev/sim0n/evaluator/Main").getInternalName()); + .map(Type.getObjectType("dev/sim0n/app/Main").getInternalName()); System.out.println("Found named " + name); - final String replaced = name == null ? "dev.sim0n.evaluator.Main" : name.replace("/", "."); + final String replaced = name == null ? "dev.sim0n.app.Main" : name.replace("/", "."); final Class clazz = classLoader.loadClass(replaced); clazz.getDeclaredMethod("main", String[].class).invoke(null, (Object) new String[0]); } diff --git a/org.mapleir.parent/org.mapleir.modasm/build.gradle b/org.mapleir.parent/org.mapleir.modasm/build.gradle index ba72838..bc46ac1 100644 --- a/org.mapleir.parent/org.mapleir.modasm/build.gradle +++ b/org.mapleir.parent/org.mapleir.modasm/build.gradle @@ -4,10 +4,10 @@ plugins { dependencies { api project(':stdlib') - api 'org.ow2.asm:asm:9.5' - api 'org.ow2.asm:asm-tree:9.5' - api 'org.ow2.asm:asm-util:9.5' - api 'org.ow2.asm:asm-commons:9.5' + api 'org.ow2.asm:asm:9.6' + api 'org.ow2.asm:asm-tree:9.6' + api 'org.ow2.asm:asm-util:9.6' + api 'org.ow2.asm:asm-commons:9.6' } group = 'dev.skidfuscator.mapleir'