hmmmm maybe not supposed to include these bin folders, ..... guess we'll find out later
Some checks failed
OpenOSRS - CI (push) / Build (push) Has been cancelled
OpenOSRS - CI (push) / Test (push) Has been cancelled
OpenOSRS - CI (push) / Checkstyle main (push) Has been cancelled
OpenOSRS - CI (push) / Checkstyle test (push) Has been cancelled
OpenOSRS - Stale issues and PRs / stale (push) Has been cancelled
OpenOSRS - Scraper / scrape-npcs (push) Has been cancelled
OpenOSRS - Gradle Dependencies / update-wrapper (push) Has been cancelled
Some checks failed
OpenOSRS - CI (push) / Build (push) Has been cancelled
OpenOSRS - CI (push) / Test (push) Has been cancelled
OpenOSRS - CI (push) / Checkstyle main (push) Has been cancelled
OpenOSRS - CI (push) / Checkstyle test (push) Has been cancelled
OpenOSRS - Stale issues and PRs / stale (push) Has been cancelled
OpenOSRS - Scraper / scrape-npcs (push) Has been cancelled
OpenOSRS - Gradle Dependencies / update-wrapper (push) Has been cancelled
This commit is contained in:
@@ -24,20 +24,25 @@
|
||||
*/
|
||||
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
import java.io.File
|
||||
|
||||
plugins {
|
||||
id("com.github.hauner.jarTest") version "1.0.1"
|
||||
}
|
||||
// Removed deprecated/incompatible jarTest plugin; not required for build
|
||||
|
||||
val deobjars: Configuration = configurations.create("deobjars")
|
||||
val vanillaJarProp: String? = (findProperty("vanillaJar") as String?) ?: System.getenv("VANILLA_JAR")
|
||||
val vanillaJarFile: File? = vanillaJarProp?.let { file(it) }?.takeIf { it.exists() }
|
||||
|
||||
configurations {
|
||||
testImplementation.get().extendsFrom(deobjars)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString())
|
||||
deobjars(project(":runescape-client"))
|
||||
// Prefer a provided local vanilla jar, else fall back to the runescape-client project jar
|
||||
if (vanillaJarFile != null) {
|
||||
deobjars(files(vanillaJarFile))
|
||||
} else {
|
||||
deobjars(project(":runescape-client"))
|
||||
}
|
||||
|
||||
annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion)
|
||||
|
||||
@@ -45,9 +50,10 @@ dependencies {
|
||||
implementation(project(":runescape-api"))
|
||||
implementation(project(":cache"))
|
||||
implementation(group = "org.jetbrains", name = "annotations", version = "22.0.0")
|
||||
implementation(group = "org.ow2.asm", name = "asm", version = "9.0")
|
||||
implementation(group = "org.ow2.asm", name = "asm-util", version = "9.0")
|
||||
implementation(group = "net.runelite", name = "fernflower", version = "07082019")
|
||||
implementation(group = "org.ow2.asm", name = "asm", version = "9.6")
|
||||
implementation(group = "org.ow2.asm", name = "asm-util", version = "9.6")
|
||||
// Replace deprecated/unavailable fernflower with Vineflower
|
||||
implementation(group = "org.vineflower", name = "vineflower", version = "1.11.1")
|
||||
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
|
||||
implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre")
|
||||
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
|
||||
@@ -59,10 +65,11 @@ dependencies {
|
||||
}
|
||||
|
||||
tasks {
|
||||
val resolvedDeob = deobjars.firstOrNull()?.toString()?.replace("\\", "/") ?: ""
|
||||
val tokens = mapOf(
|
||||
"rs.version" to ProjectVersions.rsversion.toString(),
|
||||
"vanilla.jar" to deobjars.find { it.name.startsWith("vanilla") }.toString().replace("\\", "/"),
|
||||
"rs.client" to deobjars.find { it.name.startsWith("runescape-client") }.toString().replace("\\", "/")
|
||||
"vanilla.jar" to resolvedDeob,
|
||||
"rs.client" to resolvedDeob
|
||||
)
|
||||
|
||||
processResources {
|
||||
@@ -116,4 +123,4 @@ publishing {
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ public class Parameter
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
return name != null ? name : "";
|
||||
}
|
||||
|
||||
public int getAccess()
|
||||
|
||||
Reference in New Issue
Block a user