From 7b9ef78c405dfa7a2cdea4f69a39db861f20f852 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 8 Apr 2020 17:15:46 +0200 Subject: [PATCH] gradle: Run update dependencies --- build.gradle.kts | 20 ++++++++++++++++++-- cache/cache.gradle.kts | 2 +- deobfuscator/deobfuscator.gradle.kts | 4 ++-- http-api/http-api.gradle.kts | 6 +++--- runelite-client/runelite-client.gradle.kts | 20 ++++++++++---------- wiki-scraper/wiki-scraper.gradle.kts | 4 ++-- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6863aec0c..ddb6831c01 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,14 +33,14 @@ buildscript { } dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.0.1") - classpath("com.github.ben-manes:gradle-versions-plugin:0.27.0") + classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.openosrs:injector-plugin:${ProjectVersions.openosrsInjectorVersion}") } } plugins { id("com.adarshr.test-logger") version "2.0.0" apply false - id("com.github.ben-manes.versions") version "0.27.0" + id("com.github.ben-manes.versions") version "0.28.0" id("se.patrikerdes.use-latest-versions") version "0.2.13" id("org.ajoberstar.grgit") version "4.0.1" @@ -98,6 +98,8 @@ subprojects { apply() //apply() apply(plugin = "com.adarshr.test-logger") + apply(plugin = "com.github.ben-manes.versions") + apply(plugin = "se.patrikerdes.use-latest-versions") project.extra["gitCommit"] = localGitCommit project.extra["rootPath"] = rootDir.toString().replace("\\", "/") @@ -143,6 +145,20 @@ subprojects { exclude("**/LayoutSolver.java") exclude("**/RoomType.java") } + + named("dependencyUpdates") { + checkForGradleUpdate = false + + resolutionStrategy { + componentSelection { + all { + if (candidate.displayName.contains("fernflower") || isNonStable(candidate.version)) { + reject("Non stable") + } + } + } + } + } } } diff --git a/cache/cache.gradle.kts b/cache/cache.gradle.kts index bf2200e99b..86f39353ed 100644 --- a/cache/cache.gradle.kts +++ b/cache/cache.gradle.kts @@ -41,7 +41,7 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") implementation(group = "commons-cli", name = "commons-cli", version = "1.4") - implementation(group = "io.netty", name = "netty-buffer", version = "4.1.45.Final") + implementation(group = "io.netty", name = "netty-buffer", version = "4.1.48.Final") implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1") implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index 0d4846a1fe..f09082f605 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -36,8 +36,8 @@ dependencies { deobjars(project(":runescape-client")) implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") - implementation(group = "org.ow2.asm", name = "asm", version = "7.3.1") - implementation(group = "org.ow2.asm", name = "asm-util", version = "7.3.1") + implementation(group = "org.ow2.asm", name = "asm", version = "8.0.1") + implementation(group = "org.ow2.asm", name = "asm-util", version = "8.0.1") implementation(group = "net.runelite", name = "fernflower", version = "07082019") implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 8635203b2a..94890c1458 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -35,13 +35,13 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.4.0") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.1") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.2") implementation(group = "org.apache.commons", name = "commons-csv", version = "1.8") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(project(":runelite-api")) - testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.4.0") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.5.0") testImplementation(group = "junit", name = "junit", version = "4.13") testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") } diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index 97e0095b32..d9c9dceeda 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -50,13 +50,13 @@ dependencies { implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.3") implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") - implementation(group = "com.google.inject", name = "guice", version = "4.2.2", classifier = "no_aop") + implementation(group = "com.google.inject", name = "guice", version = "4.2.3", classifier = "no_aop") implementation(group = "com.h2database", name = "h2", version = "1.4.200") implementation(group = "com.openosrs.rxrelay3", name = "rxrelay", version = "3.0.0-SNAPSHOT") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.4.0") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.1") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.2") implementation(group = "net.java.dev.jna", name = "jna", version = "5.5.0") - implementation(group = "org.jgroups", name = "jgroups", version = "4.0.0.Final") + implementation(group = "org.jgroups", name = "jgroups", version = "4.2.1.Final") implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.5.0") implementation(group = "net.runelite", name = "discord", version = "1.1") implementation(group = "org.pushing-pixels", name = "radiance-substance", version = "2.5.1") @@ -65,9 +65,9 @@ dependencies { implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") implementation(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2") implementation(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2") - implementation(group = "org.jooq", name = "jooq", version = "3.13.0") - implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.0") - implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.0") + implementation(group = "org.jooq", name = "jooq", version = "3.13.1") + implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.1") + implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.1") implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.30") implementation(group = "com.github.zafarkhaja", name = "java-semver", version = "0.9.0") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") @@ -93,13 +93,13 @@ dependencies { testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - testImplementation(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.3") + testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.2.3") testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "2.2") testImplementation(group = "junit", name = "junit", version = "4.13") testImplementation(group = "org.mockito", name = "mockito-core", version = "3.3.3") testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.3.3") - testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.4.0") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.5.0") testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") } diff --git a/wiki-scraper/wiki-scraper.gradle.kts b/wiki-scraper/wiki-scraper.gradle.kts index b8f8c395ea..a3b9e0b636 100644 --- a/wiki-scraper/wiki-scraper.gradle.kts +++ b/wiki-scraper/wiki-scraper.gradle.kts @@ -36,11 +36,11 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") implementation(group = "com.github.petitparser", name = "java-petitparser", version = "2.3.1") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.4.0") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") - implementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "5.6.0") + implementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "5.6.1") } tasks {