From 082950cc18f6ca554bbf525c60c2fd6091997b63 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Mon, 2 Aug 2021 05:21:53 -0700
Subject: [PATCH] Fix bStats becoming a transitive dependency (#4426)

---
 Essentials/build.gradle                                      | 2 --
 build-logic/src/main/kotlin/EssentialsBaseExtension.kt       | 1 +
 .../src/main/kotlin/essentials.base-conventions.gradle.kts   | 5 +++++
 providers/1_8Provider/build.gradle                           | 1 +
 providers/BaseProviders/build.gradle                         | 4 ++++
 providers/NMSReflectionProvider/build.gradle                 | 1 +
 providers/PaperProvider/build.gradle                         | 1 +
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Essentials/build.gradle b/Essentials/build.gradle
index 93169d968..647a5e57d 100644
--- a/Essentials/build.gradle
+++ b/Essentials/build.gradle
@@ -10,8 +10,6 @@ dependencies {
 
     api 'io.papermc:paperlib:1.0.6'
 
-    api 'org.bstats:bstats-bukkit:1.8'
-
     implementation 'org.spongepowered:configurate-yaml:4.1.1'
     implementation 'org.checkerframework:checker-qual:3.14.0'
 
diff --git a/build-logic/src/main/kotlin/EssentialsBaseExtension.kt b/build-logic/src/main/kotlin/EssentialsBaseExtension.kt
index 57cbd443a..bc3901781 100644
--- a/build-logic/src/main/kotlin/EssentialsBaseExtension.kt
+++ b/build-logic/src/main/kotlin/EssentialsBaseExtension.kt
@@ -4,4 +4,5 @@ import org.gradle.kotlin.dsl.property
 
 abstract class EssentialsBaseExtension(private val project: Project) {
     val injectBukkitApi: Property<Boolean> = project.objects.property<Boolean>().convention(true)
+    val injectBstats: Property<Boolean> = project.objects.property<Boolean>().convention(true)
 }
diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
index 7fa1071b4..3f058721f 100644
--- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
@@ -32,6 +32,11 @@ afterEvaluate {
             api("org.spigotmc", "spigot-api", spigotVersion)
         }
     }
+    if (baseExtension.injectBstats.get()) {
+        dependencies {
+            implementation("org.bstats", "bstats-bukkit", "1.8")
+        }
+    }
 }
 
 tasks {
diff --git a/providers/1_8Provider/build.gradle b/providers/1_8Provider/build.gradle
index ad62d860c..e04aa5426 100644
--- a/providers/1_8Provider/build.gradle
+++ b/providers/1_8Provider/build.gradle
@@ -8,4 +8,5 @@ dependencies {
 
 essentials {
     injectBukkitApi.set(false)
+    injectBstats.set(false)
 }
diff --git a/providers/BaseProviders/build.gradle b/providers/BaseProviders/build.gradle
index bba2da74c..99176e222 100644
--- a/providers/BaseProviders/build.gradle
+++ b/providers/BaseProviders/build.gradle
@@ -1,3 +1,7 @@
 plugins {
     id("essentials.base-conventions")
 }
+
+essentials {
+    injectBstats.set(false)
+}
diff --git a/providers/NMSReflectionProvider/build.gradle b/providers/NMSReflectionProvider/build.gradle
index b2510f3f0..c064338a9 100644
--- a/providers/NMSReflectionProvider/build.gradle
+++ b/providers/NMSReflectionProvider/build.gradle
@@ -9,4 +9,5 @@ dependencies {
 
 essentials {
     injectBukkitApi.set(false)
+    injectBstats.set(false)
 }
diff --git a/providers/PaperProvider/build.gradle b/providers/PaperProvider/build.gradle
index 09b6de45e..49ced3f5a 100644
--- a/providers/PaperProvider/build.gradle
+++ b/providers/PaperProvider/build.gradle
@@ -9,4 +9,5 @@ dependencies {
 
 essentials {
     injectBukkitApi.set(false)
+    injectBstats.set(false)
 }