gradle: TaskInternal.execute() has been deprecated

This commit is contained in:
Owain van Brakel
2019-07-24 20:42:03 +02:00
parent a0ecf6371a
commit 442df22f4c
2 changed files with 24 additions and 24 deletions

View File

@@ -13,13 +13,14 @@ dependencies {
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.0.0.M2a'
}
task inject(type:JavaExec) {
classpath = sourceSets.main.runtimeClasspath
main = "net.runelite.injector.Injector"
args('../runescape-client/build/libs/rs-client-1.5.30-SNAPSHOT.jar,./vanilla-181.jar,../injected-client/build/libs/injected-client-1.5.30-SNAPSHOT.jar'.split(','))
}
compileJava.doLast {
tasks.inject.execute()
def path = sourceSets.main.runtimeClasspath
def loader = new URLClassLoader(path.collect {f -> f.toURL()} as URL[])
def inject = loader.loadClass('net.runelite.injector.Injector')
String[] jarPaths = [
"${project.rootDir}/runescape-client/build/libs/rs-client-1.5.30-SNAPSHOT.jar",
"${project.projectDir}/vanilla-181.jar",
"${project.rootDir}/injected-client/build/libs/injected-client-1.5.30-SNAPSHOT.jar"
]
inject.main(jarPaths)
}

View File

@@ -9,21 +9,20 @@ dependencies {
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.0.0.M2a'
}
task assembleMojo(type:JavaExec) {
classpath = sourceSets.main.runtimeClasspath
main = "net.runelite.script.AssembleMojo"
args('../runelite-client/src/main/scripts,../runelite-client/src/main/resources/runelite'.split(','))
}
task indexMojo(type:JavaExec) {
classpath = sourceSets.main.runtimeClasspath
main = "net.runelite.script.IndexMojo"
args('../runelite-client/src/main/resources/runelite,../runelite-client/src/main/resources/runelite/index'.split(','))
}
compileJava.doLast {
tasks.assembleMojo.execute()
tasks.indexMojo.execute()
def path = sourceSets.main.runtimeClasspath
def loader = new URLClassLoader(path.collect {f -> f.toURL()} as URL[])
def assemble = loader.loadClass('net.runelite.script.AssembleMojo')
String[] assembleArgs = [
"${project.rootDir}/runelite-client/src/main/scripts",
"${project.rootDir}/runelite-client/src/main/resources/runelite"
]
assemble.main(assembleArgs)
def index = loader.loadClass('net.runelite.script.IndexMojo')
String[] indexArgs = [
"${project.rootDir}/runelite-client/src/main/resources/runelite",
"${project.rootDir}/runelite-client/src/main/resources/runelite/index"
]
index.main(indexArgs)
}