From 94f9816df3b14d1a9f5a3a23459859a0826fd04d Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Wed, 7 Apr 2021 20:54:22 +0100 Subject: [PATCH] project: update lombok --- buildSrc/src/main/kotlin/Dependencies.kt | 2 ++ cache/cache.gradle.kts | 8 ++++---- deobfuscator/deobfuscator.gradle.kts | 2 +- http-api/http-api.gradle.kts | 4 ++-- injector/injector.gradle.kts | 4 ++-- runelite-api/runelite-api.gradle.kts | 4 ++-- runelite-client/runelite-client.gradle.kts | 8 ++++---- runelite-jshell/runelite-jshell.gradle.kts | 4 ++-- wiki-scraper/wiki-scraper.gradle.kts | 4 ++-- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 465fe49fb9..0cc1867dc0 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -31,4 +31,6 @@ object ProjectVersions { const val rsversion = 194 const val cacheversion = 165 + + const val lombokVersion = "1.18.20" } diff --git a/cache/cache.gradle.kts b/cache/cache.gradle.kts index 37fba3c52f..9061346bcc 100644 --- a/cache/cache.gradle.kts +++ b/cache/cache.gradle.kts @@ -32,11 +32,11 @@ plugins { description = "Cache" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) api(project(":http-api")) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "30.0-jre") @@ -47,9 +47,9 @@ dependencies { implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + testCompileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) testImplementation(group = "junit", name = "junit", version = "4.13.1") testImplementation(group = "net.runelite.rs", name = "cache", version = "${ProjectVersions.cacheversion}") diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index 25b6ae3e94..9616a87639 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -35,7 +35,7 @@ dependencies { deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) deobjars(project(":runescape-client")) - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(project(":runelite-api")) implementation(project(":runescape-api")) diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 0ccafa95e5..e3ce785847 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -28,9 +28,9 @@ import org.apache.tools.ant.filters.ReplaceTokens description = "Web API" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(project(":runelite-api")) implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts index 6746134a52..d4a843ad72 100644 --- a/injector/injector.gradle.kts +++ b/injector/injector.gradle.kts @@ -13,9 +13,9 @@ plugins { dependencies { vanillaDep(group = "net.runelite.rs", name = "vanilla", version = rsversion.toString()) - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(gradleApi()) diff --git a/runelite-api/runelite-api.gradle.kts b/runelite-api/runelite-api.gradle.kts index 3f24b5b9d5..615c7fe92c 100644 --- a/runelite-api/runelite-api.gradle.kts +++ b/runelite-api/runelite-api.gradle.kts @@ -26,9 +26,9 @@ description = "RuneLite API" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2") implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index a1cc4cc95f..fa3fc33c9c 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -43,13 +43,13 @@ apply() description = "RuneLite Client" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.5.0") api(project(":runelite-api")) compileOnly(group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2") - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) compileOnly(group = "net.runelite", name = "orange-extensions", version = "1.0") implementation(project(":http-api")) @@ -95,9 +95,9 @@ dependencies { runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "1.0", classifier = "macos-x64") runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "1.0", classifier = "macos-arm64") - testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + testCompileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) testImplementation(group = "com.google.inject.extensions", name = "guice-grapher", version = "4.1.0") testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.1.0") diff --git a/runelite-jshell/runelite-jshell.gradle.kts b/runelite-jshell/runelite-jshell.gradle.kts index 961cfa1ecf..dd7aaa7643 100644 --- a/runelite-jshell/runelite-jshell.gradle.kts +++ b/runelite-jshell/runelite-jshell.gradle.kts @@ -27,9 +27,9 @@ group = "com.openosrs" description = "RuneLite JShell" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2") implementation(group = "com.google.inject", name = "guice", version = "4.1.0", classifier = "no_aop") diff --git a/wiki-scraper/wiki-scraper.gradle.kts b/wiki-scraper/wiki-scraper.gradle.kts index 79bdfc0f6b..383ab0db0d 100644 --- a/wiki-scraper/wiki-scraper.gradle.kts +++ b/wiki-scraper/wiki-scraper.gradle.kts @@ -29,9 +29,9 @@ dependencies { api(project(":cache")) api(project(":runelite-api")) - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + compileOnly(group = "org.projectlombok", name = "lombok", version = ProjectVersions.lombokVersion) implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") implementation(group = "com.google.guava", name = "guava", version = "23.2-jre")