diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d2bf3b7..c248428e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ javalin = "6.7.0" jte = "3.2.1" jackson = "2.18.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency` exposed = "0.61.0" -dex2jar = "v64" # Stuck until https://github.com/ThexXTURBOXx/dex2jar/issues/27 is fixed +dex2jar = "2.4.32" polyglot = "24.2.2" settings = "1.3.0" twelvemonkeys = "3.12.0" @@ -97,9 +97,9 @@ sort = "com.github.gpanther:java-nat-sort:natural-comparator-1.1" android-stubs = "com.github.Suwayomi:android-jar:1.0.0" # Asm modificiation -asm = "org.ow2.asm:asm:9.5" # version locked by Dex2Jar -dex2jar-translator = { module = "com.github.ThexXTURBOXx.dex2jar:dex-translator", version.ref = "dex2jar" } -dex2jar-tools = { module = "com.github.ThexXTURBOXx.dex2jar:dex-tools", version.ref = "dex2jar" } +asm = "org.ow2.asm:asm:9.8" # version locked by Dex2Jar +dex2jar-translator = { module = "de.femtopedia.dex2jar:dex-translator", version.ref = "dex2jar" } +dex2jar-tools = { module = "de.femtopedia.dex2jar:dex-tools", version.ref = "dex2jar" } # APK apk-parser = "net.dongliu:apk-parser:2.6.10" diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt index 3fc014c8..2b6873c4 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt @@ -67,6 +67,7 @@ object PackageTools { .printIR(false) .noCode(false) .skipExceptions(false) + .dontSanitizeNames(true) .to(jarFilePath) if (handler.hasException()) { val rootPath = Path(applicationDirs.extensionsRoot)