From f1e467038c337e151ca8cc84556ae7a4f516befe Mon Sep 17 00:00:00 2001 From: jmp Date: Thu, 31 Dec 2020 21:50:02 -0800 Subject: [PATCH] Rename `vers` to `versions` --- build.gradle.kts | 12 ++++++------ buildSrc/src/main/kotlin/DependencyVersions.kt | 3 --- 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-minecraft/cloud-brigadier/build.gradle.kts | 2 +- cloud-minecraft/cloud-bukkit/build.gradle.kts | 8 ++++---- cloud-minecraft/cloud-bungee/build.gradle.kts | 2 +- cloud-minecraft/cloud-cloudburst/build.gradle.kts | 2 +- .../cloud-minecraft-extras/build.gradle.kts | 2 +- cloud-minecraft/cloud-paper/build.gradle.kts | 8 ++++---- cloud-minecraft/cloud-velocity/build.gradle.kts | 2 +- examples/example-bukkit/build.gradle.kts | 4 ++-- examples/example-bungee/build.gradle.kts | 2 +- 15 files changed, 27 insertions(+), 30 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cd26accb..20a27c79 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -114,12 +114,12 @@ subprojects { } dependencies { - compileOnly("org.checkerframework", "checker-qual", vers["checker-qual"]) - api("io.leangen.geantyref", "geantyref", vers["geantyref"]) - testImplementation("org.junit.jupiter", "junit-jupiter-engine", vers["jupiter-engine"]) - errorprone("com.google.errorprone", "error_prone_core", vers["errorprone"]) - errorproneJavac("com.google.errorprone", "javac", vers["errorprone_javac"]) - compileOnly("com.google.errorprone", "error_prone_annotations", vers["errorprone"]) + 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"]) } nexusPublishing { diff --git a/buildSrc/src/main/kotlin/DependencyVersions.kt b/buildSrc/src/main/kotlin/DependencyVersions.kt index c381b4b0..e2258649 100644 --- a/buildSrc/src/main/kotlin/DependencyVersions.kt +++ b/buildSrc/src/main/kotlin/DependencyVersions.kt @@ -24,6 +24,3 @@ val versions = mapOf( "jupiter-engine" to "5.7.0", "jhm" to "1.25.2" ) - -val vers - get() = versions diff --git a/cloud-core/build.gradle.kts b/cloud-core/build.gradle.kts index 54863bd2..b4a129a7 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", vers["jhm"]) - testImplementation("org.openjdk.jmh", "jmh-generator-annprocess", vers["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 24ee8544..5a062b7d 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", vers["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 4e3b5caf..6a737350 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", vers["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 e5002044..04ba8736 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", vers["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 a4300063..56e1a75c 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", vers["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 63e89f5c..32aa41a6 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", vers["bukkit"]) - compileOnly("me.lucko", "commodore", vers["commodore"]) - compileOnly("org.jetbrains", "annotations", vers["jb-annotations"]) - compileOnly("com.google.guava", "guava", vers["guava"]) + 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"]) } diff --git a/cloud-minecraft/cloud-bungee/build.gradle.kts b/cloud-minecraft/cloud-bungee/build.gradle.kts index 51a7fc48..d432a261 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", vers["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 329e1b48..5d923f7e 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", vers["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 98c5b40f..28b7b1e1 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", vers["adventure-api"]) + api("net.kyori", "adventure-api", versions["adventure-api"]) } diff --git a/cloud-minecraft/cloud-paper/build.gradle.kts b/cloud-minecraft/cloud-paper/build.gradle.kts index dab1e0ab..6033cc57 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", vers["paper-api"]) - compileOnly("com.destroystokyo.paper", "paper-mojangapi", vers["paper-api"]) - compileOnly("org.jetbrains", "annotations", vers["jb-annotations"]) - compileOnly("com.google.guava", "guava", vers["guava"]) + 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"]) } diff --git a/cloud-minecraft/cloud-velocity/build.gradle.kts b/cloud-minecraft/cloud-velocity/build.gradle.kts index 2d7c7679..1b2eccd6 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", vers["velocity-api"]) + compileOnly("com.velocitypowered", "velocity-api", versions["velocity-api"]) } diff --git a/examples/example-bukkit/build.gradle.kts b/examples/example-bukkit/build.gradle.kts index aebf479e..c4a7dcf0 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", vers["commodore"]) - implementation("net.kyori", "adventure-platform-bukkit", vers["adventure-platform"]) + implementation("me.lucko", "commodore", versions["commodore"]) + implementation("net.kyori", "adventure-platform-bukkit", versions["adventure-platform"]) /* 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 60512fd1..7efef7ba 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", vers["adventure-platform"]) + implementation("net.kyori", "adventure-platform-bungeecord", versions["adventure-platform"]) /* Bungee*/ compileOnly("net.md-5", "bungeecord-api", "1.8-SNAPSHOT") }