From e911effeed802d96e534f7c93a5f0baba77f77e4 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 24 Jul 2019 22:49:38 +0200 Subject: [PATCH] gradle: Format build files --- build.gradle | 60 +++++----- cache-client/build.gradle | 11 +- cache-updater/build.gradle | 19 ++-- cache/build.gradle | 31 +++-- deobfuscator/build.gradle | 29 +++-- gradlew | 2 +- gradlew.bat | 2 +- http-api/build.gradle | 21 ++-- http-service/build.gradle | 43 ++++--- injected-client/build.gradle | 5 +- injector-plugin/build.gradle | 36 +++--- protocol-api/build.gradle | 13 +-- protocol/build.gradle | 15 ++- runelite-api/build.gradle | 11 +- runelite-client/build.gradle | 106 +++++++++--------- runelite-mixins/build.gradle | 11 +- runelite-plugin-archetype/build.gradle | 1 - runelite-script-assembler-plugin/build.gradle | 37 +++--- runescape-api/build.gradle | 2 +- runescape-client/build.gradle | 8 +- 20 files changed, 224 insertions(+), 239 deletions(-) diff --git a/build.gradle b/build.gradle index 40e4781ab9..332335009c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,46 +1,44 @@ -allprojects { - apply plugin: 'maven' - apply plugin: 'checkstyle' +allprojects { + apply plugin: 'maven' + apply plugin: 'checkstyle' - group = 'net.runelite' -version = '1.5.30-SNAPSHOT' + group = 'net.runelite' + version = '1.5.30-SNAPSHOT' } subprojects { - apply plugin: 'java' - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' - } + apply plugin: 'java' + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } - - repositories { - mavenLocal() - - maven { url "http://repo1.maven.org/maven2" } - maven { url "http://repo.runelite.net" } - maven { url "http://repo.maven.apache.org/maven2" } - maven { url "https://raw.githubusercontent.com/runelite-extended/maven-repo/master" } - } - checkstyle { - toolVersion = '6.4.1' - sourceSets = [sourceSets.main] - configFile = rootProject.file("./checkstyle/checkstyle.xml"); - showViolations = true - ignoreFailures = false - } + repositories { + mavenLocal() + + maven { url "http://repo1.maven.org/maven2" } + maven { url "http://repo.runelite.net" } + maven { url "http://repo.maven.apache.org/maven2" } + maven { url "https://raw.githubusercontent.com/runelite-extended/maven-repo/master" } + } + + checkstyle { + toolVersion = '6.4.1' + sourceSets = [sourceSets.main] + configFile = rootProject.file("./checkstyle/checkstyle.xml") + showViolations = true + ignoreFailures = false + } } wrapper { gradleVersion = '5.5.1' - def jvmOpts = "-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" - inputs.property("jvmOpts", jvmOpts) doLast { def optsEnvVar = "DEFAULT_JVM_OPTS" - scriptFile.write scriptFile.text.replace("$optsEnvVar='\"-Xmx64m\" \"-Xms64m\"'", "$optsEnvVar='\"$jvmOpts\"'") - batchScript.write batchScript.text.replace("set $optsEnvVar=\"-Xmx64m\" \"-Xms64m\"", "set $optsEnvVar=\"$jvmOpts\"") + scriptFile.write scriptFile.text.replace("$optsEnvVar='\"-Xmx64m\" \"-Xms64m\"'", "$optsEnvVar='\"-Xmx4g\" \"-Xms2g\" \"-Dfile.encoding=UTF-8\"'") + batchScript.write batchScript.text.replace("set $optsEnvVar=\"-Xmx64m\" \"-Xms64m\"", "set $optsEnvVar=\"-Xmx4g\" \"-Xms2g\" \"-Dfile.encoding=UTF-8\"") } } diff --git a/cache-client/build.gradle b/cache-client/build.gradle index a0a33cd5e9..42cd4e4836 100644 --- a/cache-client/build.gradle +++ b/cache-client/build.gradle @@ -1,9 +1,8 @@ - description = 'Cache Client' dependencies { - compile project(':cache') - compile project(':protocol') - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.26' - testCompile project(':cache') + compile project(':cache') + compile project(':protocol') + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' + testCompile project(':cache') } diff --git a/cache-updater/build.gradle b/cache-updater/build.gradle index 44b17e7655..0e145b615c 100644 --- a/cache-updater/build.gradle +++ b/cache-updater/build.gradle @@ -1,13 +1,12 @@ - description = 'Cache Updater' dependencies { - compile group: 'org.springframework.boot', name: 'spring-boot-starter', version:'1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version:'1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version:'1.5.6.RELEASE' - compile group: 'mysql', name: 'mysql-connector-java', version:'8.0.16' - compile project(':cache-client') - compile group: 'org.sql2o', name: 'sql2o', version:'1.6.0' - compile group: 'io.minio', name: 'minio', version:'3.0.6' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.6.RELEASE' + compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '1.5.6.RELEASE' + compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE' + compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.16' + compile project(':cache-client') + compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' + compile group: 'io.minio', name: 'minio', version: '3.0.6' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } diff --git a/cache/build.gradle b/cache/build.gradle index de4a91173d..0b0f7a6827 100644 --- a/cache/build.gradle +++ b/cache/build.gradle @@ -1,23 +1,22 @@ - description = 'Cache' dependencies { - compile project(':http-api') - compile group: 'com.google.guava', name: 'guava', version:'28.0-jre' - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'org.apache.commons', name: 'commons-compress', version:'1.18' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.5' - compile group: 'io.netty', name: 'netty-buffer', version:'4.1.37.Final' - compile group: 'org.antlr', name: 'antlr4-runtime', version:'4.6' - compile group: 'commons-cli', name: 'commons-cli', version:'1.4' - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.26' - testCompile group: 'net.runelite.rs', name: 'cache', version:'165' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile project(':http-api') + compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'org.apache.commons', name: 'commons-compress', version: '1.18' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + compile group: 'io.netty', name: 'netty-buffer', version: '4.1.37.Final' + compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.6' + compile group: 'commons-cli', name: 'commons-cli', version: '1.4' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' + testCompile group: 'net.runelite.rs', name: 'cache', version: '165' + compileOnly 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' + from sourceSets.test.output + classifier = 'tests' } artifacts.archives packageTests diff --git a/deobfuscator/build.gradle b/deobfuscator/build.gradle index 7ee533ad4a..65fff62a7f 100644 --- a/deobfuscator/build.gradle +++ b/deobfuscator/build.gradle @@ -1,22 +1,21 @@ - description = 'Deobfuscator' dependencies { - 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.25' - 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' + 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.25' + 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) { - from sourceSets.test.output - classifier = 'tests' + from sourceSets.test.output + classifier = 'tests' } artifacts.archives packageTests diff --git a/gradlew b/gradlew index 828c5ad940..7ebc6048bc 100755 --- a/gradlew +++ b/gradlew @@ -44,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"' +DEFAULT_JVM_OPTS='"-Xmx4g" "-Xms2g" "-Dfile.encoding=UTF-8"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 3edf62faf0..51aa92b0cb 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -30,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" +set DEFAULT_JVM_OPTS="-Xmx4g" "-Xms2g" "-Dfile.encoding=UTF-8" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/http-api/build.gradle b/http-api/build.gradle index 23c9d1b238..d808f5bb49 100644 --- a/http-api/build.gradle +++ b/http-api/build.gradle @@ -1,14 +1,13 @@ - description = 'Web API' dependencies { - compile group: 'com.squareup.okhttp3', name: 'okhttp', version:'3.14.0' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.5' - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'org.apache.commons', name: 'commons-csv', version:'1.4' - compile group: 'io.reactivex.rxjava2', name: 'rxjava', version:'2.2.10' - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.26' - testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version:'3.14.0' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.14.0' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'org.apache.commons', name: 'commons-csv', version: '1.4' + compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' + testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.14.0' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } diff --git a/http-service/build.gradle b/http-service/build.gradle index 17d341d34e..61d1e7ae22 100644 --- a/http-service/build.gradle +++ b/http-service/build.gradle @@ -1,29 +1,28 @@ - apply plugin: 'war' description = 'Web Service' dependencies { - compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version:'1.5.6.RELEASE' - compile group: 'org.springframework', name: 'spring-jdbc', version:'4.3.10.RELEASE' - compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version:'1.2.0.Final' - compile project(':http-api') - compile project(':cache') - compile group: 'org.sql2o', name: 'sql2o', version:'1.6.0' - compile group: 'com.google.guava', name: 'guava', version:'28.0-jre' - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'com.github.scribejava', name: 'scribejava-apis', version:'6.6.3' - compile group: 'io.minio', name: 'minio', version:'3.0.6' - compile(group: 'redis.clients', name: 'jedis', version:'3.0.1') { -exclude(module: 'commons-pool2') + compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.6.RELEASE' + compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE' + compile group: 'org.springframework', name: 'spring-jdbc', version: '4.3.10.RELEASE' + compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.2.0.Final' + compile project(':http-api') + compile project(':cache') + compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' + compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.6.3' + compile group: 'io.minio', name: 'minio', version: '3.0.6' + compile(group: 'redis.clients', name: 'jedis', version: '3.0.1') { + exclude(module: 'commons-pool2') } - testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'1.5.6.RELEASE') { -exclude(module: 'commons-logging') + testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.6.RELEASE') { + exclude(module: 'commons-logging') } - testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version:'3.14.0' - testCompile group: 'com.h2database', name: 'h2', version:'1.4.196' - providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version:'1.5.6.RELEASE' - providedCompile group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version:'2.4.2' + testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.14.0' + testCompile group: 'com.h2database', name: 'h2', version: '1.4.196' + providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '1.5.6.RELEASE' + providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2' } diff --git a/injected-client/build.gradle b/injected-client/build.gradle index eb9ca810ae..0534874e3f 100644 --- a/injected-client/build.gradle +++ b/injected-client/build.gradle @@ -1,6 +1,5 @@ - description = 'Injected Client' dependencies { - compile project(':rs-client') - compile group: 'net.runelite.rs', name: 'vanilla', version:'181' + compile project(':rs-client') + compile group: 'net.runelite.rs', name: 'vanilla', version: '181' } diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle index 36474c5966..b1cc1f6e27 100644 --- a/injector-plugin/build.gradle +++ b/injector-plugin/build.gradle @@ -1,26 +1,26 @@ group = 'net.runelite.rs' description = 'Injector' dependencies { - compile project(':deobfuscator') - compile project(':mixins') - compile project(':runelite-api') - compile project(':runescape-api') - compile group: 'org.apache.maven', name: 'maven-plugin-api', version:'3.6.1' - testCompile project(':deobfuscator') - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile 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' + compile project(':deobfuscator') + compile project(':mixins') + compile project(':runelite-api') + compile project(':runescape-api') + compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' + testCompile project(':deobfuscator') + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile 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' annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.0.0.M2a' } compileJava.doLast { - 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) + 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) } \ No newline at end of file diff --git a/protocol-api/build.gradle b/protocol-api/build.gradle index b138f1fe43..2650a7c7b8 100644 --- a/protocol-api/build.gradle +++ b/protocol-api/build.gradle @@ -1,10 +1,9 @@ - description = 'Protocol API' dependencies { - compile project(':runelite-api') - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'com.google.guava', name: 'guava', version:'28.0-jre' - testCompile group: 'junit', name: 'junit', version:'4.12' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile project(':runelite-api') + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' + testCompile group: 'junit', name: 'junit', version: '4.12' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } diff --git a/protocol/build.gradle b/protocol/build.gradle index 778363b00a..faacf85e28 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -1,11 +1,10 @@ - description = 'Protocol' dependencies { - compile project(':protocol-api') - compile project(':cache') - compile group: 'com.google.guava', name: 'guava', version:'28.0-jre' - compile group: 'io.netty', name: 'netty-all', version:'4.1.37.Final' - testCompile group: 'junit', name: 'junit', version:'4.12' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile project(':protocol-api') + compile project(':cache') + compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' + compile group: 'io.netty', name: 'netty-all', version: '4.1.37.Final' + testCompile group: 'junit', name: 'junit', version: '4.12' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } diff --git a/runelite-api/build.gradle b/runelite-api/build.gradle index 157fdb3ccf..05857a558b 100644 --- a/runelite-api/build.gradle +++ b/runelite-api/build.gradle @@ -1,9 +1,8 @@ - description = 'RuneLite API' dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'com.google.code.findbugs', name: 'jsr305', version:'3.0.2' - testCompile group: 'junit', name: 'junit', version:'4.12' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' + testCompile group: 'junit', name: 'junit', version: '4.12' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' } diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle index bb78d1d468..acfc1178e6 100644 --- a/runelite-client/build.gradle +++ b/runelite-client/build.gradle @@ -1,72 +1,72 @@ plugins { - id 'com.github.johnrengelman.shadow' version '5.1.0' - id 'java' + id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'java' } description = 'RuneLite Client' dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' - compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3' - compile group: 'net.sf.jopt-simple', name: 'jopt-simple', version:'5.0.1' - compile group: 'com.google.guava', name: 'guava', version:'28.0-jre' - compile group: 'com.google.inject', name: 'guice', version:'4.1.0', classifier:'no_aop' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.5' - compile group: 'net.runelite.pushingpixels', name: 'substance', version:'8.0.02' - compile group: 'org.apache.commons', name: 'commons-text', version:'1.2' - compile group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2' - compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2' - compile(group: 'io.sigpipe', name: 'jbsdiff', version:'1.0') { -exclude(module: 'xz') + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' + compile group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.1' + compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' + compile group: 'com.google.inject', name: 'guice', version: '4.1.0', classifier: 'no_aop' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + compile group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02' + compile group: 'org.apache.commons', name: 'commons-text', version: '1.2' + compile group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2' + compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2' + compile(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') { + exclude(module: 'xz') } - compile group: 'net.java.dev.jna', name: 'jna', version:'4.5.1' - compile group: 'net.java.dev.jna', name: 'jna-platform', version:'4.5.1' - compile project(':runelite-api') - compile project(':http-api') - compile group: 'net.runelite', name: 'discord', version:'1.1' - compile group: 'org.javassist', name: 'javassist', version:'3.25.0-GA' - compile group: 'org.xeustechnologies', name: 'jcl-core', version:'2.8' - compile group: 'org.jetbrains', name: 'annotations', version:'17.0.0' - compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version:'[1.0.0,)' - compile group: 'org.ow2.asm', name: 'asm-all', version:'6.0_BETA' - compile group: 'org.codehaus.plexus', name: 'plexus-utils', version:'3.2.0' - compile group: 'org.apache.httpcomponents', name: 'httpcore', version:'4.4.11' - compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.5.9' - compile group: 'io.reactivex.rxjava2', name: 'rxjava', version:'2.2.10' - compile group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version:'2.1.0' - 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-i586' - runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-linux-amd64' - runtime group: 'org.jogamp.jogl', name: 'jogl-all', version:'2.3.2', classifier:'natives-linux-i586' - runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-windows-amd64' - runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version:'2.3.2', classifier:'natives-windows-i586' - 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 project(':runescape-api') - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3' - testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19' - testCompile group: 'com.google.inject.extensions', name: 'guice-testlib', version:'4.1.0' - testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version:'4.1.0' - compileOnly group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - annotationProcessor group: 'org.projectlombok', name: 'lombok', version:'1.18.8' - compileOnly group: 'net.runelite', name: 'orange-extensions', version:'1.0' + compile group: 'net.java.dev.jna', name: 'jna', version: '4.5.1' + compile group: 'net.java.dev.jna', name: 'jna-platform', version: '4.5.1' + compile project(':runelite-api') + compile project(':http-api') + compile group: 'net.runelite', name: 'discord', version: '1.1' + compile group: 'org.javassist', name: 'javassist', version: '3.25.0-GA' + compile group: 'org.xeustechnologies', name: 'jcl-core', version: '2.8' + compile group: 'org.jetbrains', name: 'annotations', version: '17.0.0' + compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)' + compile group: 'org.ow2.asm', name: 'asm-all', version: '6.0_BETA' + compile group: 'org.codehaus.plexus', name: 'plexus-utils', version: '3.2.0' + compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11' + compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9' + compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' + compile group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0' + 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-i586' + runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-linux-amd64' + runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-linux-i586' + runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-windows-amd64' + runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-windows-i586' + 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 project(':runescape-api') + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3' + testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' + testCompile group: 'com.google.inject.extensions', name: 'guice-testlib', version: '4.1.0' + testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.1.0' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' + compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0' } tasks.withType(AbstractArchiveTask) { - preserveFileTimestamps = false - reproducibleFileOrder = true + preserveFileTimestamps = false + reproducibleFileOrder = true } jar { - manifest { - attributes 'Main-Class': 'net.runelite.client.RuneLite' - } + manifest { + attributes 'Main-Class': 'net.runelite.client.RuneLite' + } } shadowJar { - classifier = "shaded" + classifier = "shaded" } tasks.build.dependsOn tasks.shadowJar \ No newline at end of file diff --git a/runelite-mixins/build.gradle b/runelite-mixins/build.gradle index 198b761f2a..ed59895c8a 100644 --- a/runelite-mixins/build.gradle +++ b/runelite-mixins/build.gradle @@ -1,10 +1,9 @@ - description = 'RuneLite Mixins' dependencies { - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.mockito', name: 'mockito-all', version:'1.10.19' - compileOnly group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' + compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' compile project(':runescape-api') - compileOnly group: 'com.google.guava', name: 'guava', version:'28.0-jre' - compileOnly group: 'javax.inject', name: 'javax.inject', version:'1' + compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre' + compileOnly group: 'javax.inject', name: 'javax.inject', version: '1' } diff --git a/runelite-plugin-archetype/build.gradle b/runelite-plugin-archetype/build.gradle index 9b3a33612e..9d0ad72536 100644 --- a/runelite-plugin-archetype/build.gradle +++ b/runelite-plugin-archetype/build.gradle @@ -1,2 +1 @@ - description = 'RuneLite Plugin Archetype' diff --git a/runelite-script-assembler-plugin/build.gradle b/runelite-script-assembler-plugin/build.gradle index c21a44b2db..a38e99113e 100644 --- a/runelite-script-assembler-plugin/build.gradle +++ b/runelite-script-assembler-plugin/build.gradle @@ -1,28 +1,27 @@ - description = 'Script Assembler Plugin' dependencies { - compile project(':cache') - compile project(':runelite-api') - compile group: 'org.apache.maven', name: 'maven-plugin-api', version:'3.6.1' + compile project(':cache') + compile project(':runelite-api') + compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.25' - 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.0.0.M2a' } compileJava.doLast { - 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 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) + 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) } diff --git a/runescape-api/build.gradle b/runescape-api/build.gradle index bd24d9fee3..4295d3b740 100644 --- a/runescape-api/build.gradle +++ b/runescape-api/build.gradle @@ -1,5 +1,5 @@ group = 'net.runelite.rs' description = 'RuneScape API' dependencies { - compile project(':runelite-api') + compile project(':runelite-api') } diff --git a/runescape-client/build.gradle b/runescape-client/build.gradle index db6950afa5..ea985ed5be 100644 --- a/runescape-client/build.gradle +++ b/runescape-client/build.gradle @@ -1,8 +1,8 @@ group = 'net.runelite.rs' description = 'RuneScape Client' dependencies { - compile project(':runescape-api') - testCompile group: 'junit', name: 'junit', version:'4.12' - testCompile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.26' - testCompile group: 'org.slf4j', name: 'slf4j-simple', version:'1.7.26' + compile project(':runescape-api') + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' + testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' }