diff --git a/cache/build.gradle b/cache/build.gradle index f6febcd2c1..d15d1392b9 100644 --- a/cache/build.gradle +++ b/cache/build.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.filters.ReplaceTokens + plugins { id "com.github.hauner.jarTest" version "1.0.1" } @@ -19,3 +21,17 @@ dependencies { compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } + +ext { + rsversion = 181 + cacheversion = 165 +} + +processTestResources { + from file("src/test/resources/cache.properties"), { + filter(ReplaceTokens, tokens: [ + "rs.version": rsversion.toString(), + "cache.version": cacheversion.toString() + ]) + } +} \ No newline at end of file diff --git a/cache/src/test/resources/cache.properties b/cache/src/test/resources/cache.properties index 03e58d141f..be42aebc22 100644 --- a/cache/src/test/resources/cache.properties +++ b/cache/src/test/resources/cache.properties @@ -1,3 +1,3 @@ -rs.version=${rs.version} -cache.version=${cache.version} +rs.version=@rs.version@ +cache.version=@cache.version@ diff --git a/deobfuscator/build.gradle b/deobfuscator/build.gradle index 4fe4ff601b..bee405515d 100644 --- a/deobfuscator/build.gradle +++ b/deobfuscator/build.gradle @@ -1,9 +1,16 @@ +import org.apache.tools.ant.filters.ReplaceTokens + plugins { id "com.github.hauner.jarTest" version "1.0.1" } description = 'Deobfuscator' +def osrsRevision = 181 +def rootPath = project.rootDir.toString().replace('\\', '/') +def deobfuscatedJar = "${rootPath}/runescape-client/build/libs/rs-client-${project.version}.jar" +def vanillaJar = "${rootPath}/injector-plugin/vanilla-${osrsRevision}.jar" + dependencies { implementation project(':runelite-api') implementation project(':runescape-api') @@ -18,3 +25,17 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0' } + +ext { + rsversion = 181 +} + +processTestResources { + from file("src/test/resources/deob-test.properties"), { + filter(ReplaceTokens, tokens: [ + "rs.client": deobfuscatedJar.toString(), + "rs.version": rsversion.toString(), + "vanilla.jar": vanillaJar.toString() + ]) + } +} \ No newline at end of file diff --git a/deobfuscator/src/test/resources/deob-test.properties b/deobfuscator/src/test/resources/deob-test.properties index 9d858d1a0b..4305ae87d0 100644 --- a/deobfuscator/src/test/resources/deob-test.properties +++ b/deobfuscator/src/test/resources/deob-test.properties @@ -1,3 +1,3 @@ -rs.client=${net.runelite.rs:rs-client:jar} -rs.version=${rs.version} -vanilla.client=${net.runelite.rs:vanilla:jar} \ No newline at end of file +rs.client=@rs.client@ +rs.version=@rs.version@ +vanilla.client=@vanilla.jar@ \ No newline at end of file diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle index de4a9eb716..e13735518b 100644 --- a/injector-plugin/build.gradle +++ b/injector-plugin/build.gradle @@ -2,9 +2,11 @@ group = 'net.runelite.rs' description = 'Injector' def osrsRevision = 181 -def deobfuscatedJar = [project.rootDir, 'runescape-client', 'build', 'libs', "rs-client-${project.version}.jar"].join(File.separator) -def vanillaJar = [project.buildDir, "vanilla-${osrsRevision}.jar"].join(File.separator) -def injectedJar = [project.rootDir, 'injected-client', 'build', 'libs', "injected-client-${project.version}.jar"].join(File.separator) +def rootPath = project.rootDir.toString().replace('\\', '/') +def buildPath = project.buildDir.toString().replace('\\', '/') +def deobfuscatedJar = "${rootPath}/runescape-client/build/libs/rs-client-${project.version}.jar" +def vanillaJar = "${buildPath}/vanilla-${osrsRevision}.jar" +def injectedJar = "${rootPath}/injected-client/build/libs/injected-client-${project.version}.jar" configurations { vanilla