From f8fa96390451c9e60842ed2d7412d87f35a3024f Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Mon, 24 Apr 2023 01:00:38 +0200
Subject: [PATCH] Upgraded to Gradle 8.1

---
 .../kotlin/floodgate.shadow-conventions.gradle.kts    | 10 +++++-----
 gradle.properties                                     |  1 +
 gradle/wrapper/gradle-wrapper.properties              |  2 +-
 settings.gradle.kts                                   |  2 +-
 velocity/isolated/build.gradle.kts                    | 11 ++++-------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts
index e99dfaf5..eebd8c34 100644
--- a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts
@@ -7,14 +7,14 @@ plugins {
 
 tasks {
     named<Jar>("jar") {
-        archiveClassifier.set("unshaded")
+        archiveClassifier = "unshaded"
         from(project.rootProject.file("LICENSE"))
     }
 
     val shadowJar = named<ShadowJar>("shadowJar") {
-        archiveBaseName.set("floodgate-${project.name}")
-        archiveVersion.set("")
-        archiveClassifier.set("")
+        archiveBaseName = "floodgate-${project.name}"
+        archiveVersion = ""
+        archiveClassifier = ""
 
         val sJar: ShadowJar = this
 
@@ -37,7 +37,7 @@ tasks {
 
         val destinationDir = System.getenv("DESTINATION_DIRECTORY");
         if (destinationDir != null) {
-            destinationDirectory.set(file(destinationDir))
+            destinationDirectory = file(destinationDir)
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 7b5c2e70..7c421476 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 org.gradle.configureondemand=true
 org.gradle.caching=true
 org.gradle.parallel=true
+systemProp.org.gradle.unsafe.kotlin.assignment=true
 
 version=2.2.2-SNAPSHOT
 micronautVersion=3.9.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bdc9a83b..37aef8d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1b67a026..7620744c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,7 +2,7 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
     repositories {
         mavenLocal()
 
diff --git a/velocity/isolated/build.gradle.kts b/velocity/isolated/build.gradle.kts
index 4ac9b268..a46356c6 100644
--- a/velocity/isolated/build.gradle.kts
+++ b/velocity/isolated/build.gradle.kts
@@ -1,13 +1,10 @@
-var log4jVersion = "2.11.2"
-var gsonVersion = "2.8.8"
-var guavaVersion = "25.1-jre"
-
 plugins {
     java
 }
 
 dependencies {
     api(projects.isolation)
+    compileOnlyApi("com.velocitypowered", "velocity-api", Versions.velocityVersion)
 }
 
 tasks {
@@ -17,9 +14,9 @@ tasks {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         from (configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
 
-        archiveBaseName.set("floodgate-${project.name}")
-        archiveVersion.set("")
-        archiveClassifier.set("")
+        archiveBaseName = "floodgate-${project.name}"
+        archiveVersion = ""
+        archiveClassifier = ""
 
         val velocityBaseJar = project.projects
             .velocityBase.dependencyProject