gradle: Remove deprecated methods

This commit is contained in:
Owain van Brakel
2019-07-27 06:26:59 +02:00
parent d8ddfa9110
commit 8d1489254f
18 changed files with 161 additions and 146 deletions

View File

@@ -13,5 +13,5 @@ cache:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/ - $HOME/.gradle/wrapper/
script: ./gradlew clean build -x test script: ./gradlew build -x test --rerun-tasks

View File

@@ -18,7 +18,7 @@ allprojects {
} }
subprojects { subprojects {
apply plugin: 'java' apply plugin: 'java-library'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

View File

@@ -1,8 +1,12 @@
description = 'Cache Client' description = 'Cache Client'
dependencies { dependencies {
compile project(':cache') api project(':cache')
compile project(':protocol') api project(':protocol')
testCompile group: 'junit', name: 'junit', version: '4.12' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
testCompile project(':cache') implementation group: 'io.netty', name: 'netty-all', version: '4.1.37.Final'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
testImplementation project(path: ':cache', configuration: 'testArchives')
} }

View File

@@ -1,12 +1,13 @@
description = 'Cache Updater' description = 'Cache Updater'
dependencies { dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '2.1.6.RELEASE' implementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: '2.1.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '2.1.6.RELEASE' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '2.1.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE' implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17' implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
compile project(':cache-client') implementation project(':cache-client')
compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' implementation group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
compile group: 'io.minio', name: 'minio', version: '6.0.8' implementation group: 'io.minio', name: 'minio', version: '6.0.8'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

33
cache/build.gradle vendored
View File

@@ -1,22 +1,21 @@
plugins {
id "com.github.hauner.jarTest" version "1.0.1"
}
description = 'Cache' description = 'Cache'
dependencies { dependencies {
compile project(':http-api') api project(':http-api')
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'org.apache.commons', name: 'commons-compress', version: '1.18' implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.18'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'io.netty', name: 'netty-buffer', version: '4.1.37.Final' implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.37.Final'
compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2' implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2'
compile group: 'commons-cli', name: 'commons-cli', version: '1.4' implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
testCompile group: 'net.runelite.rs', name: 'cache', version: '165' testImplementation group: 'net.runelite.rs', name: 'cache', version: '165'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }
task packageTests(type: Jar) {
from sourceSets.test.output
classifier = 'tests'
}
artifacts.archives packageTests

View File

@@ -1,21 +1,20 @@
description = 'Deobfuscator' plugins {
dependencies { id "com.github.hauner.jarTest" version "1.0.1"
compile project(':runelite-api')
compile project(':runescape-api')
compile group: 'net.runelite', name: 'fernflower', version: '20171017'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
testCompile project(':rs-client')
testCompile group: 'net.runelite.rs', name: 'vanilla', version: '181'
testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
} }
task packageTests(type: Jar) { description = 'Deobfuscator'
from sourceSets.test.output
classifier = 'tests' dependencies {
implementation project(':runelite-api')
implementation project(':runescape-api')
implementation group: 'net.runelite', name: 'fernflower', version: '20171017'
implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
implementation group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
testImplementation project(':rs-client')
testImplementation group: 'net.runelite.rs', name: 'vanilla', version: '181'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
} }
artifacts.archives packageTests

View File

@@ -1,13 +1,13 @@
description = 'Web API' description = 'Web API'
dependencies { dependencies {
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1' implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7' implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1' testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -2,25 +2,26 @@ apply plugin: 'war'
description = 'Web Service' description = 'Web Service'
dependencies { dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.6.RELEASE' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.6.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE' implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
compile group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE' implementation group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE'
compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final' implementation group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final'
compile project(':http-api') api project(':http-api')
compile project(':cache') api project(':cache')
compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' implementation group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'io.minio', name: 'minio', version: '6.0.8' implementation group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0'
compile(group: 'redis.clients', name: 'jedis', version: '3.1.0') { implementation group: 'io.minio', name: 'minio', version: '6.0.8'
implementation(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
exclude(module: 'commons-pool2') exclude(module: 'commons-pool2')
} }
testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') { testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
exclude(module: 'commons-logging') exclude(module: 'commons-logging')
} }
testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1' testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
testCompile group: 'com.h2database', name: 'h2', version: '1.4.199' testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.1.6.RELEASE' providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.1.6.RELEASE'
providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8' providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'

View File

@@ -1,5 +1,5 @@
description = 'Injected Client' description = 'Injected Client'
dependencies { dependencies {
compile project(':rs-client') implementation project(':rs-client')
compile group: 'net.runelite.rs', name: 'vanilla', version: '181' implementation group: 'net.runelite.rs', name: 'vanilla', version: '181'
} }

View File

@@ -2,30 +2,35 @@ group = 'net.runelite.rs'
description = 'Injector' description = 'Injector'
def osrsRevision = 181 def osrsRevision = 181
def deobfuscatedJar = "${project.rootDir}/runescape-client/build/libs/rs-client-"+project.version+".jar" def deobfuscatedJar = [project.rootDir, 'runescape-client', 'build', 'libs', "rs-client-${project.version}.jar"].join(File.separator)
def vanillaJar = "$buildDir/vanilla-"+osrsRevision+".jar" def vanillaJar = [project.buildDir, "vanilla-${osrsRevision}.jar"].join(File.separator)
def injectedJar = "${project.rootDir}/injected-client/build/libs/injected-client-"+project.version+".jar" def injectedJar = [project.rootDir, 'injected-client', 'build', 'libs', "injected-client-${project.version}.jar"].join(File.separator)
configurations { configurations {
vanilla vanilla
} }
dependencies { dependencies {
compile project(':deobfuscator') implementation project(':deobfuscator')
compile project(':mixins') implementation project(':mixins')
compile project(':runelite-api') implementation project(':runelite-api')
compile project(':runescape-api') implementation project(':runescape-api')
compile project(':rs-client') implementation project(':injected-client')
compile project(':injected-client') implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
testCompile project(':deobfuscator') implementation group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation project(':deobfuscator')
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0' compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0'
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3' annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3'
vanilla "net.runelite.rs:vanilla:"+osrsRevision vanilla "net.runelite.rs:vanilla:"+osrsRevision
} }
compileJava {
dependsOn ":rs-client:build"
}
compileJava.outputs.upToDateWhen {false} compileJava.outputs.upToDateWhen {false}
compileJava.doLast() { compileJava.doLast() {
@@ -37,9 +42,9 @@ compileJava.doLast() {
def loader = new URLClassLoader(path.collect { f -> f.toURL() } as URL[]) def loader = new URLClassLoader(path.collect { f -> f.toURL() } as URL[])
def inject = loader.loadClass('net.runelite.injector.Injector') def inject = loader.loadClass('net.runelite.injector.Injector')
String[] jarPaths = [ String[] jarPaths = [
deobfuscatedJar, deobfuscatedJar.toString(),
vanillaJar, vanillaJar.toString(),
injectedJar injectedJar.toString()
] ]
inject.main(jarPaths) inject.main(jarPaths)
} }

View File

@@ -1,9 +1,9 @@
description = 'Protocol API' description = 'Protocol API'
dependencies { dependencies {
compile project(':runelite-api') implementation project(':runelite-api')
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -1,10 +1,11 @@
description = 'Protocol' description = 'Protocol'
dependencies { dependencies {
compile project(':protocol-api') api project(':protocol-api')
compile project(':cache') implementation project(':cache')
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'io.netty', name: 'netty-all', version: '4.1.37.Final' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
testCompile group: 'junit', name: 'junit', version: '4.12' implementation group: 'io.netty', name: 'netty-all', version: '4.1.37.Final'
testImplementation group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -1,8 +1,8 @@
description = 'RuneLite API' description = 'RuneLite API'
dependencies { dependencies {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -6,34 +6,35 @@ plugins {
description = 'RuneLite Client' description = 'RuneLite Client'
dependencies { dependencies {
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1'
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4'
compile group: 'com.google.inject', name: 'guice', version: '4.2.2', classifier: 'no_aop' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' implementation group: 'com.google.inject', name: 'guice', version: '4.2.2', classifier: 'no_aop'
compile group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'org.apache.commons', name: 'commons-text', version: '1.7' implementation group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02'
compile group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2' implementation group: 'org.apache.commons', name: 'commons-text', version: '1.7'
compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2' implementation group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2'
compile(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') { implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2'
implementation(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') {
exclude(module: 'xz') exclude(module: 'xz')
} }
compile group: 'net.java.dev.jna', name: 'jna', version: '5.4.0' implementation group: 'net.java.dev.jna', name: 'jna', version: '5.4.0'
compile group: 'net.java.dev.jna', name: 'jna-platform', version: '5.4.0' implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.4.0'
compile project(':runelite-api') implementation project(':runelite-api')
compile project(':http-api') implementation project(':http-api')
compile group: 'net.runelite', name: 'discord', version: '1.1' implementation group: 'net.runelite', name: 'discord', version: '1.1'
compile group: 'org.javassist', name: 'javassist', version: '3.25.0-GA' implementation group: 'org.javassist', name: 'javassist', version: '3.25.0-GA'
compile group: 'org.xeustechnologies', name: 'jcl-core', version: '2.8' implementation group: 'org.xeustechnologies', name: 'jcl-core', version: '2.8'
compile group: 'org.jetbrains', name: 'annotations', version: '17.0.0' implementation group: 'org.jetbrains', name: 'annotations', version: '17.0.0'
compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)' implementation group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)'
compile group: 'org.ow2.asm', name: 'asm-all', version: '6.0_BETA' implementation group: 'org.ow2.asm', name: 'asm-all', version: '6.0_BETA'
compile group: 'org.codehaus.plexus', name: 'plexus-utils', version: '3.2.1' implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version: '3.2.1'
compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11' implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11'
compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9' implementation group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9'
compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
compile group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0' implementation group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0'
runtime group: 'net.runelite.pushingpixels', name: 'trident', version: '1.5.00' runtime group: 'net.runelite.pushingpixels', name: 'trident', version: '1.5.00'
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-amd64' runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-amd64'
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-i586' runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-i586'
@@ -44,13 +45,16 @@ dependencies {
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-amd64' runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-amd64'
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-i586' runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-i586'
runtime project(':runescape-api') runtime project(':runescape-api')
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1' testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testCompile group: 'com.google.inject.extensions', name: 'guice-testlib', version: '4.2.2' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.2.2' testImplementation group: 'com.google.inject.extensions', name: 'guice-testlib', version: '4.2.2'
testImplementation group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.2.2'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
testCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0' compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0'
} }
@@ -66,7 +70,7 @@ jar {
} }
shadowJar { shadowJar {
classifier = "shaded" archiveClassifier.set("shaded")
} }
tasks.build.dependsOn tasks.shadowJar tasks.build.dependsOn tasks.shadowJar

View File

@@ -1,9 +1,9 @@
description = 'RuneLite Mixins' description = 'RuneLite Mixins'
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
compile project(':runescape-api') implementation project(':runescape-api')
compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre' compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compileOnly group: 'javax.inject', name: 'javax.inject', version: '1' compileOnly group: 'javax.inject', name: 'javax.inject', version: '1'
} }

View File

@@ -1,9 +1,10 @@
description = 'Script Assembler Plugin' description = 'Script Assembler Plugin'
dependencies { dependencies {
compile project(':cache') implementation project(':cache')
compile project(':runelite-api') implementation project(':runelite-api')
compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.26' implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
implementation group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.26'
compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0' compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0'
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3' annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3'
} }

View File

@@ -1,5 +1,5 @@
group = 'net.runelite.rs' group = 'net.runelite.rs'
description = 'RuneScape API' description = 'RuneScape API'
dependencies { dependencies {
compile project(':runelite-api') api project(':runelite-api')
} }

View File

@@ -1,8 +1,8 @@
group = 'net.runelite.rs' group = 'net.runelite.rs'
description = 'RuneScape Client' description = 'RuneScape Client'
dependencies { dependencies {
compile project(':runescape-api') implementation project(':runescape-api')
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
} }