From 440248fbeb6693cfabb82e1af6b75533f7371761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20St=C3=A4ding?= <alexanderstaeding@gmail.com>
Date: Sun, 29 Oct 2023 19:43:06 +0100
Subject: [PATCH] Fix incorrectly merged buildscript changes from dev/3.0.0
 (#1130)

* Fix incorrectly merged buildscript changes from dev/3.0.0

* Bump version to 5.0.0-SNAPSHOT in gradle.properties

Co-authored-by: powercas_gamer <cas@deltapvp.net>

---------

Co-authored-by: powercas_gamer <cas@deltapvp.net>
---
 api/build.gradle.kts | 23 +++++++----------------
 gradle.properties    | 28 ++--------------------------
 2 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 429ec5a61..32fdc7071 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -11,21 +11,12 @@ java {
     sourceSets["main"].java {
         srcDir("src/ap/java")
     }
-    
+
     sourceSets["main"].resources {
         srcDir("src/ap/resources")
     }
 }
 
-val gsonVersion: String by project.extra
-val guiceVersion: String by project.extra
-val guavaVersion: String by project.extra
-val adventureVersion: String by project.extra
-val slf4jVersion: String by project.extra
-val checkerFrameworkVersion: String by project.extra
-val configurateVersion: String by project.extra
-val caffeineVersion: String by project.extra
-
 dependencies {
     api(libs.gson)
     api(libs.guava)
@@ -61,12 +52,12 @@ tasks {
         o.source = "8"
 
         o.links(
-                "https://www.slf4j.org/apidocs/",
-                "https://guava.dev/releases/$guavaVersion/api/docs/",
-                "https://google.github.io/guice/api-docs/$guiceVersion/javadoc/",
-                "https://docs.oracle.com/en/java/javase/17/docs/api/",
-                "https://jd.advntr.dev/api/$adventureVersion/",
-                "https://javadoc.io/doc/com.github.ben-manes.caffeine/caffeine/3.1.5/"
+            "https://www.slf4j.org/apidocs/",
+            "https://guava.dev/releases/${libs.guava.get().version}/api/docs/",
+            "https://google.github.io/guice/api-docs/${libs.guice.get().version}/javadoc/",
+            "https://docs.oracle.com/en/java/javase/11/docs/api/",
+            "https://jd.advntr.dev/api/${libs.adventure.bom.get().version}/",
+            "https://javadoc.io/doc/com.github.ben-manes.caffeine/caffeine"
         )
 
         // Disable the crazy super-strict doclint tool in Java 8
diff --git a/gradle.properties b/gradle.properties
index 9d79146b8..13fb9a53c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,26 +1,2 @@
-# API dependencies.
-gsonVersion=2.10.1
-junitVersion=5.9.0
-slf4jVersion=1.7.30
-adventureVersion=4.12.0
-guavaVersion=31.1-jre
-checkerFrameworkVersion=3.28.0
-configurateVersion=4.1.2
-guiceVersion=5.1.0
-
-# Proxy dependencies.
-log4jVersion=2.20.0
-nettyVersion=4.1.90.Final
-flareVersion=2.0.1
-asyncHttpClientVersion=2.12.3
-bstatsVersion=3.0.1
-caffeineVersion=3.1.5
-lmbdaVersion=2.0.0
-nightConfigVersion=3.6.6
-completableFuturesVersion=0.3.5
-adventureFacetVersion=4.2.0
-fastutilVersion=8.5.12
-disruptorVersion=3.4.4
-jlineVersion=3.23.0
-terminalConsoleAppenderVersion=1.3.0
-joptSimpleVersion=5.0.4
+group=com.velocitypowered
+version=5.0.0-SNAPSHOT