From 30df64b4d4c4b084ea191a38dff2c2192986fc89 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 29 Dec 2024 12:52:05 +0100
Subject: [PATCH] Enable configuration cache

---
 build-logic/src/main/kotlin/via.base-conventions.gradle.kts | 4 +++-
 build.gradle.kts                                            | 3 +--
 bukkit/src/main/resources/plugin.yml                        | 6 +++---
 .../viaversion/viaversion/common/dummy/TestPlatform.java    | 5 -----
 fabric/build.gradle.kts                                     | 2 --
 gradle.properties                                           | 1 +
 gradle/libs.versions.toml                                   | 2 +-
 settings.gradle.kts                                         | 4 ++--
 8 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build-logic/src/main/kotlin/via.base-conventions.gradle.kts b/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
index 043784492..c7d7adb6d 100644
--- a/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
@@ -6,8 +6,10 @@ plugins {
 tasks {
     // Variable replacements
     processResources {
+        val ver = project.version.toString()
+        val desc = project.description
         filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
-            expand("version" to project.version, "description" to project.description, "url" to "https://viaversion.com")
+            expand("version" to ver, "description" to desc)
         }
     }
     javadoc {
diff --git a/build.gradle.kts b/build.gradle.kts
index 57044fd9f..67ac358e0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,7 @@ val main = setOf(
     projects.viaversionCommon,
     projects.viaversionApi,
     projects.viaversionBukkit,
-    projects.viaversionVelocity,
-    projects.viaversionFabric
+    projects.viaversionVelocity
 ).map { it.path }
 
 subprojects {
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index 60c1aa56f..23c8cd223 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -1,9 +1,9 @@
 name: ViaVersion
 main: com.viaversion.viaversion.ViaVersionPlugin
 authors: [ _MylesC, creeper123123321, Gerrygames, kennytv, Matsv, EnZaXD, RK_01 ]
-version: ${version}
-description: ${description}
-website: ${url}
+version: "${version}"
+description: "${description}"
+website: "https://viaversion.com"
 api-version: 1.13
 folia-supported: true
 loadbefore: [ ProtocolLib ]
diff --git a/common/src/test/java/com/viaversion/viaversion/common/dummy/TestPlatform.java b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestPlatform.java
index ecae95db6..4d41b3860 100644
--- a/common/src/test/java/com/viaversion/viaversion/common/dummy/TestPlatform.java
+++ b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestPlatform.java
@@ -94,11 +94,6 @@ public final class TestPlatform implements ViaPlatform {
         return false;
     }
 
-    @Override
-    public boolean isPluginEnabled() {
-        return false;
-    }
-
     @Override
     public ViaAPI getApi() {
         return new ViaAPIBase() {
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index 7d82dc72f..e69de29bb 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -1,2 +0,0 @@
-dependencies {
-}
diff --git a/gradle.properties b/gradle.properties
index 826392112..4b6fef37a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,3 +10,4 @@ velocityVersion=3.4
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
+org.gradle.configuration-cache=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index efbfc235e..2d9b1f988 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ checkerQual = "3.48.1"
 paper = "1.20.4-R0.1-SNAPSHOT"
 legacyBukkit = "1.8.8-R0.1-SNAPSHOT"
 velocity = "3.1.1"
-viaProxy = "3.3.7-SNAPSHOT"
+viaProxy = "3.3.8-SNAPSHOT"
 
 [libraries]
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3f79ddd61..f2824d10b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,8 +15,8 @@ pluginManagement {
     // default plugin versions
     plugins {
         id("net.kyori.blossom") version "2.1.0"
-        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
-        id("com.gradleup.shadow") version "8.3.0"
+        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.9"
+        id("com.gradleup.shadow") version "8.3.5"
     }
 }