diff --git a/build.gradle.kts b/build.gradle.kts index 3f73f2ceb1..d3d0097f38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,30 +115,6 @@ subprojects { isIgnoreFailures = false } } - - tasks.withType { - doLast { - // sign jar - if (System.getProperty("signKeyStore") != null) { - // ensure ant is initialized so we can copy the project variable later - ant.invokeMethod("echo", mapOf("message" to "initializing ant")) - - for (file in outputs.files) { - org.apache.tools.ant.taskdefs.SignJar().apply { - // why is this required - project = ant.project - - setKeystore(System.getProperty("signKeyStore")) - setStorepass(System.getProperty("signStorePass")) - setAlias(System.getProperty("signAlias")) - setJar(file) - setSignedjar(file) - execute() - } - } - } - } - } configure { repositories { @@ -186,6 +162,30 @@ subprojects { exclude("**/LayoutSolver.java") exclude("**/RoomType.java") } + + withType { + doLast { + // sign jar + if (System.getProperty("signKeyStore") != null) { + // ensure ant is initialized so we can copy the project variable later + ant.invokeMethod("echo", mapOf("message" to "initializing ant")) + + for (file in outputs.files) { + org.apache.tools.ant.taskdefs.SignJar().apply { + // why is this required + project = ant.project + + setKeystore(System.getProperty("signKeyStore")) + setStorepass(System.getProperty("signStorePass")) + setAlias(System.getProperty("signAlias")) + setJar(file) + setSignedjar(file) + execute() + } + } + } + } + } } configurations["compileOnly"].extendsFrom(configurations["annotationProcessor"]) diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index 7aecaff0ec..85a5efc236 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -56,12 +56,17 @@ dependencies { implementation(project(":runelite-jshell")) implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.3") implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") - implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre") + implementation(group = "com.google.guava", name = "guava", version = "30.1.1-jre") { + exclude(group = "com.google.code.findbugs", module = "jsr305") + exclude(group = "com.google.errorprone", module = "error_prone_annotations") + exclude(group = "com.google.j2objc", module = "j2objc-annotations") + exclude(group = "org.codehaus.mojo", module = "animal-sniffer-annotations") + } implementation(group = "com.google.inject", name = "guice", version = "5.0.1") implementation(group = "com.h2database", name = "h2", version = "1.4.200") implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.1") implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.1") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.1.1") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.1.2") implementation(group = "org.jgroups", name = "jgroups", version = "5.1.9.Final") implementation(group = "net.java.dev.jna", name = "jna", version = "5.9.0") implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.9.0")