From b848070d57b7906356ad9b5fbc42f40e56e0b66d Mon Sep 17 00:00:00 2001 From: jmp Date: Thu, 31 Dec 2020 22:09:31 -0800 Subject: [PATCH] Use an Object with fields instead of a Map for dependency versions --- build.gradle.kts | 12 ++++---- .../src/main/kotlin/DependencyVersions.kt | 26 ---------------- buildSrc/src/main/kotlin/Versions.kt | 30 +++++++++++++++++++ cloud-core/build.gradle.kts | 4 +-- cloud-discord/cloud-javacord/build.gradle.kts | 2 +- cloud-discord/cloud-jda/build.gradle.kts | 2 +- cloud-irc/cloud-pircbotx/build.gradle.kts | 2 +- .../cloud-brigadier/build.gradle.kts | 2 +- cloud-minecraft/cloud-bukkit/build.gradle.kts | 8 ++--- cloud-minecraft/cloud-bungee/build.gradle.kts | 2 +- .../cloud-cloudburst/build.gradle.kts | 2 +- .../cloud-minecraft-extras/build.gradle.kts | 2 +- cloud-minecraft/cloud-paper/build.gradle.kts | 8 ++--- .../cloud-velocity/build.gradle.kts | 2 +- examples/example-bukkit/build.gradle.kts | 4 +-- examples/example-bungee/build.gradle.kts | 2 +- examples/example-velocity/build.gradle.kts | 4 +-- 17 files changed, 59 insertions(+), 55 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/DependencyVersions.kt create mode 100644 buildSrc/src/main/kotlin/Versions.kt diff --git a/build.gradle.kts b/build.gradle.kts index 20a27c79..6d05c83a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -114,12 +114,12 @@ subprojects { } dependencies { - compileOnly("org.checkerframework", "checker-qual", versions["checker-qual"]) - api("io.leangen.geantyref", "geantyref", versions["geantyref"]) - testImplementation("org.junit.jupiter", "junit-jupiter-engine", versions["jupiter-engine"]) - errorprone("com.google.errorprone", "error_prone_core", versions["errorprone"]) - errorproneJavac("com.google.errorprone", "javac", versions["errorprone_javac"]) - compileOnly("com.google.errorprone", "error_prone_annotations", versions["errorprone"]) + compileOnly("org.checkerframework", "checker-qual", Versions.checkerQual) + api("io.leangen.geantyref", "geantyref", Versions.geantyref) + testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.jupiterEngine) + errorprone("com.google.errorprone", "error_prone_core", Versions.errorprone) + errorproneJavac("com.google.errorprone", "javac", Versions.errorprone_javac) + compileOnly("com.google.errorprone", "error_prone_annotations", Versions.errorprone) } nexusPublishing { diff --git a/buildSrc/src/main/kotlin/DependencyVersions.kt b/buildSrc/src/main/kotlin/DependencyVersions.kt deleted file mode 100644 index e2258649..00000000 --- a/buildSrc/src/main/kotlin/DependencyVersions.kt +++ /dev/null @@ -1,26 +0,0 @@ -val versions = mapOf( - "checker-qual" to "3.8.0", - "geantyref" to "1.3.11", - "errorprone" to "2.4.0", - "errorprone_javac" to "9+181-r4173-1", - // DISCORD DEPENDENCIES - "javacord" to "3.1.1", - "jda" to "4.2.0_209", - // MINECRAFT DEPENDENCIES - "brigadier" to "1.0.17", - "bukkit" to "1.13.2-R0.1-SNAPSHOT", - "commodore" to "1.9", - "bungeecord" to "1.8-SNAPSHOT", - "cloudburst" to "1.0.0-SNAPSHOT", - "adventure-api" to "4.3.0", - "adventure-platform" to "4.0.0-SNAPSHOT", - "paper-api" to "1.15.2-R0.1-SNAPSHOT", - "velocity-api" to "1.1.0", - "jb-annotations" to "20.1.0", - "guava" to "21.0-jre", - // IRC DEPENDENCIES - "pircbotx" to "83a4c22e80", - // TEST DEPENDENCIES - "jupiter-engine" to "5.7.0", - "jhm" to "1.25.2" -) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 00000000..170311b0 --- /dev/null +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,30 @@ +object Versions { + const val checkerQual = "3.8.0" + const val geantyref = "1.3.11" + const val errorprone = "2.4.0" + const val errorprone_javac = "9+181-r4173-1" + + // DISCORD DEPENDENCIES + const val javacord = "3.1.1" + const val jda = "4.2.0_209" + + // MINECRAFT DEPENDENCIES + const val brigadier = "1.0.17" + const val bukkit = "1.13.2-R0.1-SNAPSHOT" + const val commodore = "1.9" + const val bungeecord = "1.8-SNAPSHOT" + const val cloudburst = "1.0.0-SNAPSHOT" + const val adventureApi = "4.3.0" + const val adventurePlatform = "4.0.0-SNAPSHOT" + const val paperApi = "1.15.2-R0.1-SNAPSHOT" + const val velocityApi = "1.1.0" + const val jetbrainsAnnotations = "20.1.0" + const val guava = "21.0-jre" + + // IRC DEPENDENCIES + const val pircbotx = "83a4c22e80" + + // TEST DEPENDENCIES + const val jupiterEngine = "5.7.0" + const val jhm = "1.25.2" +} diff --git a/cloud-core/build.gradle.kts b/cloud-core/build.gradle.kts index b4a129a7..7a6168cb 100644 --- a/cloud-core/build.gradle.kts +++ b/cloud-core/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { api(project(":cloud-services")) - testImplementation("org.openjdk.jmh", "jmh-core", versions["jhm"]) - testImplementation("org.openjdk.jmh", "jmh-generator-annprocess", versions["jhm"]) + testImplementation("org.openjdk.jmh", "jmh-core", Versions.jhm) + testImplementation("org.openjdk.jmh", "jmh-generator-annprocess", Versions.jhm) } diff --git a/cloud-discord/cloud-javacord/build.gradle.kts b/cloud-discord/cloud-javacord/build.gradle.kts index 5a062b7d..9a8b753d 100644 --- a/cloud-discord/cloud-javacord/build.gradle.kts +++ b/cloud-discord/cloud-javacord/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - implementation("org.javacord", "javacord", versions["javacord"]) + implementation("org.javacord", "javacord", Versions.javacord) } diff --git a/cloud-discord/cloud-jda/build.gradle.kts b/cloud-discord/cloud-jda/build.gradle.kts index 6a737350..b7706788 100644 --- a/cloud-discord/cloud-jda/build.gradle.kts +++ b/cloud-discord/cloud-jda/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - compileOnly ("net.dv8tion", "JDA", versions["jda"]) + compileOnly ("net.dv8tion", "JDA", Versions.jda) } diff --git a/cloud-irc/cloud-pircbotx/build.gradle.kts b/cloud-irc/cloud-pircbotx/build.gradle.kts index 04ba8736..056ea729 100644 --- a/cloud-irc/cloud-pircbotx/build.gradle.kts +++ b/cloud-irc/cloud-pircbotx/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - implementation("com.github.pircbotx", "pircbotx", versions["pircbotx"]) + implementation("com.github.pircbotx", "pircbotx", Versions.pircbotx) } diff --git a/cloud-minecraft/cloud-brigadier/build.gradle.kts b/cloud-minecraft/cloud-brigadier/build.gradle.kts index 56e1a75c..982977e3 100644 --- a/cloud-minecraft/cloud-brigadier/build.gradle.kts +++ b/cloud-minecraft/cloud-brigadier/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { implementation(project(":cloud-core")) /* Needs to be provided by the platform */ - compileOnly("com.mojang", "brigadier", versions["brigadier"]) + compileOnly("com.mojang", "brigadier", Versions.brigadier) } diff --git a/cloud-minecraft/cloud-bukkit/build.gradle.kts b/cloud-minecraft/cloud-bukkit/build.gradle.kts index 32aa41a6..308798b5 100644 --- a/cloud-minecraft/cloud-bukkit/build.gradle.kts +++ b/cloud-minecraft/cloud-bukkit/build.gradle.kts @@ -2,8 +2,8 @@ dependencies { api(project(":cloud-core")) api(project(":cloud-brigadier")) api(project(":cloud-tasks")) - compileOnly("org.bukkit", "bukkit", versions["bukkit"]) - compileOnly("me.lucko", "commodore", versions["commodore"]) - compileOnly("org.jetbrains", "annotations", versions["jb-annotations"]) - compileOnly("com.google.guava", "guava", versions["guava"]) + compileOnly("org.bukkit", "bukkit", Versions.bukkit) + compileOnly("me.lucko", "commodore", Versions.commodore) + compileOnly("org.jetbrains", "annotations", Versions.jetbrainsAnnotations) + compileOnly("com.google.guava", "guava", Versions.guava) } diff --git a/cloud-minecraft/cloud-bungee/build.gradle.kts b/cloud-minecraft/cloud-bungee/build.gradle.kts index d432a261..4172e97a 100644 --- a/cloud-minecraft/cloud-bungee/build.gradle.kts +++ b/cloud-minecraft/cloud-bungee/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - compileOnly("net.md-5", "bungeecord-api", versions["bungeecord"]) + compileOnly("net.md-5", "bungeecord-api", Versions.bungeecord) } diff --git a/cloud-minecraft/cloud-cloudburst/build.gradle.kts b/cloud-minecraft/cloud-cloudburst/build.gradle.kts index 5d923f7e..3c8d8177 100644 --- a/cloud-minecraft/cloud-cloudburst/build.gradle.kts +++ b/cloud-minecraft/cloud-cloudburst/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - compileOnly("org.cloudburstmc", "cloudburst-server", versions["cloudburst"]) + compileOnly("org.cloudburstmc", "cloudburst-server", Versions.cloudburst) } diff --git a/cloud-minecraft/cloud-minecraft-extras/build.gradle.kts b/cloud-minecraft/cloud-minecraft-extras/build.gradle.kts index 28b7b1e1..8a878997 100644 --- a/cloud-minecraft/cloud-minecraft-extras/build.gradle.kts +++ b/cloud-minecraft/cloud-minecraft-extras/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { api(project(":cloud-core")) - api("net.kyori", "adventure-api", versions["adventure-api"]) + api("net.kyori", "adventure-api", Versions.adventureApi) } diff --git a/cloud-minecraft/cloud-paper/build.gradle.kts b/cloud-minecraft/cloud-paper/build.gradle.kts index 6033cc57..8ac642c3 100644 --- a/cloud-minecraft/cloud-paper/build.gradle.kts +++ b/cloud-minecraft/cloud-paper/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { api(project(":cloud-bukkit")) - compileOnly("com.destroystokyo.paper", "paper-api", versions["paper-api"]) - compileOnly("com.destroystokyo.paper", "paper-mojangapi", versions["paper-api"]) - compileOnly("org.jetbrains", "annotations", versions["jb-annotations"]) - compileOnly("com.google.guava", "guava", versions["guava"]) + compileOnly("com.destroystokyo.paper", "paper-api", Versions.paperApi) + compileOnly("com.destroystokyo.paper", "paper-mojangapi", Versions.paperApi) + compileOnly("org.jetbrains", "annotations", Versions.jetbrainsAnnotations) + compileOnly("com.google.guava", "guava", Versions.guava) } diff --git a/cloud-minecraft/cloud-velocity/build.gradle.kts b/cloud-minecraft/cloud-velocity/build.gradle.kts index 1b2eccd6..d679ac2d 100644 --- a/cloud-minecraft/cloud-velocity/build.gradle.kts +++ b/cloud-minecraft/cloud-velocity/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { api(project(":cloud-core")) api(project(":cloud-brigadier")) - compileOnly("com.velocitypowered", "velocity-api", versions["velocity-api"]) + compileOnly("com.velocitypowered", "velocity-api", Versions.velocityApi) } diff --git a/examples/example-bukkit/build.gradle.kts b/examples/example-bukkit/build.gradle.kts index c4a7dcf0..1963fd7a 100644 --- a/examples/example-bukkit/build.gradle.kts +++ b/examples/example-bukkit/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { implementation(project(":cloud-annotations")) implementation(project(":cloud-minecraft-extras")) /* Extras */ - implementation("me.lucko", "commodore", versions["commodore"]) - implementation("net.kyori", "adventure-platform-bukkit", versions["adventure-platform"]) + implementation("me.lucko", "commodore", Versions.commodore) + implementation("net.kyori", "adventure-platform-bukkit", Versions.adventurePlatform) /* Bukkit */ compileOnly("org.bukkit", "bukkit", "1.8.8-R0.1-SNAPSHOT") } diff --git a/examples/example-bungee/build.gradle.kts b/examples/example-bungee/build.gradle.kts index 7efef7ba..64105d40 100644 --- a/examples/example-bungee/build.gradle.kts +++ b/examples/example-bungee/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { implementation(project(":cloud-annotations")) implementation(project(":cloud-minecraft-extras")) /* Extras */ - implementation("net.kyori", "adventure-platform-bungeecord", versions["adventure-platform"]) + implementation("net.kyori", "adventure-platform-bungeecord", Versions.adventurePlatform) /* Bungee*/ compileOnly("net.md-5", "bungeecord-api", "1.8-SNAPSHOT") } diff --git a/examples/example-velocity/build.gradle.kts b/examples/example-velocity/build.gradle.kts index 7a6f5754..fc39e412 100644 --- a/examples/example-velocity/build.gradle.kts +++ b/examples/example-velocity/build.gradle.kts @@ -17,6 +17,6 @@ dependencies { api(project(":cloud-velocity")) api(project(":cloud-minecraft-extras")) api(project(":cloud-annotations")) - compileOnly("com.velocitypowered:velocity-api:1.1.0") - annotationProcessor("com.velocitypowered:velocity-api:1.1.0") + compileOnly("com.velocitypowered", "velocity-api", Versions.velocityApi) + annotationProcessor("com.velocitypowered", "velocity-api", Versions.velocityApi) }