client: Externals rework

This commit is contained in:
Owain van Brakel
2020-02-04 05:42:26 +01:00
parent cbb5c50939
commit aecffd8f71
29 changed files with 2058 additions and 430 deletions

View File

@@ -25,7 +25,7 @@
import org.apache.tools.ant.filters.ReplaceTokens
import java.text.SimpleDateFormat
import java.util.*
import java.util.Date
plugins {
id(Plugins.shadow.first) version Plugins.shadow.second
@@ -39,6 +39,7 @@ description = "RuneLite Client"
dependencies {
annotationProcessor(Libraries.lombok)
annotationProcessor(Libraries.pf4j)
compileOnly(Libraries.javax)
compileOnly(Libraries.lombok)
@@ -58,7 +59,6 @@ dependencies {
implementation(Libraries.substance)
implementation(Libraries.jopt)
implementation(Libraries.apacheCommonsText)
implementation(Libraries.plexus)
implementation(Libraries.annotations)
implementation(Libraries.jogampGluegen)
implementation(Libraries.jogampJogl)
@@ -67,6 +67,10 @@ dependencies {
implementation(Libraries.jooqMeta)
implementation(Libraries.sentry)
implementation(Libraries.slf4jApi)
implementation(Libraries.pf4j) {
exclude(group = "org.slf4j")
}
implementation(Libraries.pf4jUpdate)
implementation(project(":http-api"))
api(project(":runelite-api"))
implementation(Libraries.naturalMouse)
@@ -108,6 +112,14 @@ fun launcherVersion(): String {
return "-1"
}
fun pluginPath(): String {
if (project.hasProperty("pluginPath")) {
print(project.property("pluginPath").toString())
return project.property("pluginPath").toString()
}
return ""
}
tasks {
build {
finalizedBy("shadowJar")
@@ -123,7 +135,8 @@ tasks {
"rs.version" to ProjectVersions.rsversion.toString(),
"open.osrs.version" to ProjectVersions.openosrsVersion,
"open.osrs.builddate" to formatDate(Date()),
"launcher.version" to launcherVersion()
"launcher.version" to launcherVersion(),
"plugin.path" to pluginPath()
)
inputs.properties(tokens)
@@ -151,7 +164,6 @@ tasks {
group = "openosrs"
}
register<JavaExec>("RuneLite.main()") {
group = "openosrs"