From 98692c7d7871d5c9affdf07ce68bc20aa94e95de Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 11 Jan 2020 12:24:58 +0000 Subject: [PATCH] Add Java 8 compatibility As a result of the Kotlin port, using Java 11 becomes less important. Java 8 is still fairly widespread, so I think supporting it is still worthwhile. --- README.md | 2 +- deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fcad8b9804..e9d9832a82 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ released in late 2009. Building OpenRS2 requires the following pieces of software: -* [Java Development Kit][jdk] (version 11) +* [Java Development Kit][jdk] (version 8 or later) * [Apache Maven][maven] (version 3.3.9 or later) ### Non-free components diff --git a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt index 2ff5ba53cb..89ba0a9cae 100644 --- a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt +++ b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt @@ -83,7 +83,7 @@ class Deobfuscator(private val input: Path, private val output: Path) { glUnpacker.remap(create(glUnpacker, "unpacker_")) // bundle libraries together into a common classpath - val runtime = ClassLoader.getPlatformClassLoader() + val runtime = ClassLoader.getSystemClassLoader() val classPath = ClassPath( runtime, dependencies = listOf(), diff --git a/pom.xml b/pom.xml index 22af7bfe1f..c1ba03c274 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ dev.openrs2 openrs2-parent - 1.0.7 + 1.0.8 openrs2 @@ -70,7 +70,7 @@ dev.openrs2 fernflower - 1.0.1 + 1.0.2 dev.openrs2 @@ -80,7 +80,7 @@ dev.openrs2 pack200 - 1.0.1 + 1.0.2 org.ow2.asm