From 9e8d1fca1c05bb8b68a654b6c7063c52d6ff506a Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 11 Apr 2021 12:28:15 +0100 Subject: [PATCH] Use type-safe project accessors Signed-off-by: Graham --- all/build.gradle.kts | 12 ++++++------ archive/build.gradle.kts | 22 +++++++++++----------- asm/build.gradle.kts | 6 +++--- cache/build.gradle.kts | 8 ++++---- compress-cli/build.gradle.kts | 2 +- compress/build.gradle.kts | 2 +- conf/build.gradle.kts | 2 +- crypto/build.gradle.kts | 4 ++-- decompiler/build.gradle.kts | 4 ++-- deob-ast/build.gradle.kts | 6 +++--- deob-bytecode/build.gradle.kts | 10 +++++----- deob-processor/build.gradle.kts | 8 ++++---- deob-util/build.gradle.kts | 4 ++-- deob/build.gradle.kts | 8 ++++---- game/build.gradle.kts | 2 +- net/build.gradle.kts | 2 +- patcher/build.gradle.kts | 8 ++++---- protocol/build.gradle.kts | 4 ++-- settings.gradle.kts | 1 + 19 files changed, 58 insertions(+), 57 deletions(-) diff --git a/all/build.gradle.kts b/all/build.gradle.kts index f2dbc758..691f8b14 100644 --- a/all/build.gradle.kts +++ b/all/build.gradle.kts @@ -15,12 +15,12 @@ application { } dependencies { - implementation(project(":archive")) - implementation(project(":compress-cli")) - implementation(project(":crc32")) - implementation(project(":deob")) - implementation(project(":game")) - implementation(project(":patcher")) + implementation(projects.archive) + implementation(projects.compressCli) + implementation(projects.crc32) + implementation(projects.deob) + implementation(projects.game) + implementation(projects.patcher) } tasks.shadowJar { diff --git a/archive/build.gradle.kts b/archive/build.gradle.kts index 6b31379f..f48c8d0a 100644 --- a/archive/build.gradle.kts +++ b/archive/build.gradle.kts @@ -11,17 +11,17 @@ application { dependencies { api(libs.clikt) - implementation(project(":buffer")) - implementation(project(":cache")) - implementation(project(":cli")) - implementation(project(":db")) - implementation(project(":http")) - implementation(project(":inject")) - implementation(project(":json")) - implementation(project(":net")) - implementation(project(":protocol")) - implementation(project(":util")) - implementation(project(":yaml")) + implementation(projects.buffer) + implementation(projects.cache) + implementation(projects.cli) + implementation(projects.db) + implementation(projects.http) + implementation(projects.inject) + implementation(projects.json) + implementation(projects.net) + implementation(projects.protocol) + implementation(projects.util) + implementation(projects.yaml) implementation(libs.bootstrap) implementation(libs.bundles.ktor) implementation(libs.bundles.thymeleaf) diff --git a/asm/build.gradle.kts b/asm/build.gradle.kts index a5ee514d..1b453f8b 100644 --- a/asm/build.gradle.kts +++ b/asm/build.gradle.kts @@ -4,13 +4,13 @@ plugins { } dependencies { - api(project(":util")) + api(projects.util) api(libs.bundles.asm) api(libs.guice) api(libs.jackson.databind) - implementation(project(":compress")) - implementation(project(":crypto")) + implementation(projects.compress) + implementation(projects.crypto) } publishing { diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index 9cc692da..0a75fa74 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -4,14 +4,14 @@ plugins { } dependencies { - api(project(":crypto")) + api(projects.crypto) api(libs.fastutil) api(libs.guice) api(libs.netty.buffer) - implementation(project(":buffer")) - implementation(project(":compress")) - implementation(project(":util")) + implementation(projects.buffer) + implementation(projects.compress) + implementation(projects.util) testImplementation(libs.jimfs) } diff --git a/compress-cli/build.gradle.kts b/compress-cli/build.gradle.kts index 18283132..73967c62 100644 --- a/compress-cli/build.gradle.kts +++ b/compress-cli/build.gradle.kts @@ -11,7 +11,7 @@ application { dependencies { api(libs.clikt) - implementation(project(":compress")) + implementation(projects.compress) } publishing { diff --git a/compress/build.gradle.kts b/compress/build.gradle.kts index 24d15754..156534d3 100644 --- a/compress/build.gradle.kts +++ b/compress/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(libs.xz) - implementation(project(":util")) + implementation(projects.util) api(libs.commons.compress) api(libs.guava) } diff --git a/conf/build.gradle.kts b/conf/build.gradle.kts index 0675aa2f..7478ac55 100644 --- a/conf/build.gradle.kts +++ b/conf/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(libs.guice) - implementation(project(":yaml")) + implementation(projects.yaml) } publishing { diff --git a/crypto/build.gradle.kts b/crypto/build.gradle.kts index 601b7aa8..c23f285f 100644 --- a/crypto/build.gradle.kts +++ b/crypto/build.gradle.kts @@ -9,9 +9,9 @@ dependencies { api(libs.jackson.databind) api(libs.netty.buffer) - implementation(project(":util")) + implementation(projects.util) - testImplementation(project(":buffer")) + testImplementation(projects.buffer) testImplementation(libs.jimfs) } diff --git a/decompiler/build.gradle.kts b/decompiler/build.gradle.kts index 76bf3e9f..5d0952dc 100644 --- a/decompiler/build.gradle.kts +++ b/decompiler/build.gradle.kts @@ -10,11 +10,11 @@ application { } dependencies { - api(project(":deob-util")) + api(projects.deobUtil) api(libs.clikt) api(libs.guice) - implementation(project(":util")) + implementation(projects.util) implementation(libs.fernflower) } diff --git a/deob-ast/build.gradle.kts b/deob-ast/build.gradle.kts index 2ff9cb35..e4ebb93c 100644 --- a/deob-ast/build.gradle.kts +++ b/deob-ast/build.gradle.kts @@ -9,12 +9,12 @@ application { } dependencies { - api(project(":deob-util")) + api(projects.deobUtil) api(libs.clikt) api(libs.guice) - implementation(project(":inject")) - implementation(project(":util")) + implementation(projects.inject) + implementation(projects.util) implementation(libs.guava) implementation(libs.javaParser) implementation(libs.jdom) diff --git a/deob-bytecode/build.gradle.kts b/deob-bytecode/build.gradle.kts index 6b73efdc..cf5d872b 100644 --- a/deob-bytecode/build.gradle.kts +++ b/deob-bytecode/build.gradle.kts @@ -12,11 +12,11 @@ dependencies { api(libs.clikt) api(libs.guice) - implementation(project(":deob-annotations")) - implementation(project(":deob-util")) - implementation(project(":inject")) - implementation(project(":patcher")) - implementation(project(":yaml")) + implementation(projects.deobAnnotations) + implementation(projects.deobUtil) + implementation(projects.inject) + implementation(projects.patcher) + implementation(projects.yaml) implementation(libs.fastutil) implementation(libs.guava) implementation(libs.jgrapht) diff --git a/deob-processor/build.gradle.kts b/deob-processor/build.gradle.kts index 86803038..5e36e921 100644 --- a/deob-processor/build.gradle.kts +++ b/deob-processor/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - implementation(project(":deob-annotations")) - implementation(project(":deob-util")) - implementation(project(":inject")) - implementation(project(":yaml")) + implementation(projects.deobAnnotations) + implementation(projects.deobUtil) + implementation(projects.inject) + implementation(projects.yaml) } publishing { diff --git a/deob-util/build.gradle.kts b/deob-util/build.gradle.kts index 49c1e275..71081627 100644 --- a/deob-util/build.gradle.kts +++ b/deob-util/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - api(project(":asm")) - api(project(":yaml")) + api(projects.asm) + api(projects.yaml) } publishing { diff --git a/deob/build.gradle.kts b/deob/build.gradle.kts index 126775e0..52696627 100644 --- a/deob/build.gradle.kts +++ b/deob/build.gradle.kts @@ -12,10 +12,10 @@ application { dependencies { api(libs.clikt) - implementation(project(":decompiler")) - implementation(project(":deob-ast")) - implementation(project(":deob-bytecode")) - implementation(project(":inject")) + implementation(projects.decompiler) + implementation(projects.deobAst) + implementation(projects.deobBytecode) + implementation(projects.inject) } publishing { diff --git a/game/build.gradle.kts b/game/build.gradle.kts index 311c4a53..a3300bb4 100644 --- a/game/build.gradle.kts +++ b/game/build.gradle.kts @@ -11,7 +11,7 @@ application { dependencies { api(libs.clikt) - implementation(project(":inject")) + implementation(projects.inject) } publishing { diff --git a/net/build.gradle.kts b/net/build.gradle.kts index cdd237fe..f3025da2 100644 --- a/net/build.gradle.kts +++ b/net/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(libs.kotlin.coroutines.core) api(libs.netty.transport) - implementation(project(":buffer")) + implementation(projects.buffer) implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:${libs.versions.nettyIoUring.get()}:linux-aarch_64") implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:${libs.versions.nettyIoUring.get()}:linux-x86_64") implementation("io.netty:netty-transport-native-epoll:${libs.versions.netty.get()}:linux-aarch_64") diff --git a/patcher/build.gradle.kts b/patcher/build.gradle.kts index 400b19b6..8395f2e9 100644 --- a/patcher/build.gradle.kts +++ b/patcher/build.gradle.kts @@ -9,13 +9,13 @@ application { } dependencies { - api(project(":asm")) + api(projects.asm) api(libs.clikt) api(libs.guice) - implementation(project(":conf")) - implementation(project(":crypto")) - implementation(project(":inject")) + implementation(projects.conf) + implementation(projects.crypto) + implementation(projects.inject) implementation(libs.openrs2.natives) } diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts index 405c3027..4730e30a 100644 --- a/protocol/build.gradle.kts +++ b/protocol/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - api(project(":crypto")) + api(projects.crypto) api(libs.netty.codec) - implementation(project(":buffer")) + implementation(projects.buffer) } publishing { diff --git a/settings.gradle.kts b/settings.gradle.kts index 753d07f9..5af8a1a8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,6 +21,7 @@ pluginManagement { } } +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") enableFeaturePreview("VERSION_CATALOGS") include(