diff --git a/README.md b/README.md index 21a9143ca5..b5eacd88e7 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ released in late 2009. ## Prerequisites -OpenRS2 requires version 8 or later of the [Java Development Kit][jdk]. +OpenRS2 requires version 11 or later of the [Java Development Kit][jdk]. The JDK is required even if a pre-built copy of OpenRS2 is used, as it depends on JDK-only tools, such as `jarsigner`, at runtime. diff --git a/build.gradle.kts b/build.gradle.kts index 9ad7c08a8e..73f5ae4015 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,14 +41,14 @@ allprojects { configure { withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } tasks.withType { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs = listOf("-Xjsr305=strict") } } diff --git a/jsobject/build.gradle.kts b/jsobject/build.gradle.kts deleted file mode 100644 index 876b8eb221..0000000000 --- a/jsobject/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - `java-library` - `maven-publish` -} - -publishing { - publications.create("maven") { - from(components["java"]) - - pom { - packaging = "jar" - name.set("OpenRS2 JavaScript Object") - description.set( - """ - Stubs for the netscape.javascript package. - """.trimIndent() - ) - } - } -} diff --git a/jsobject/src/main/java/netscape/javascript/JSObject.java b/jsobject/src/main/java/netscape/javascript/JSObject.java deleted file mode 100644 index e91b86f37e..0000000000 --- a/jsobject/src/main/java/netscape/javascript/JSObject.java +++ /dev/null @@ -1,12 +0,0 @@ -package netscape.javascript; - -import java.applet.Applet; - -public abstract class JSObject { - public static JSObject getWindow(Applet applet) { - return null; - } - - public abstract Object call(String methodName, Object... args); - public abstract Object eval(String s); -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 79a1403ba9..39291edba4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,8 +11,7 @@ include( "deob", "deob-annotations", "deob-ast", - "game", - "jsobject" + "game" ) if (Files.exists(rootProject.projectDir.toPath().resolve("nonfree/build.gradle.kts"))) {