From 2aacc7666901d229cdcaeae81e59a80fc2215f5c Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
Date: Tue, 25 May 2021 13:07:46 -0700
Subject: [PATCH] Update Toothpick to 1.1.0-SNAPSHOT

---
 build.gradle.kts    | 11 ++++-------
 settings.gradle.kts | 27 +++++++++------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 51ac593b1..c04f232cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,7 @@
-import xyz.jpenilla.toothpick.gitCmd
-import xyz.jpenilla.toothpick.toothpick
-
 plugins {
     `java-library`
     `maven-publish`
-    id("xyz.jpenilla.toothpick") version "1.0.0-SNAPSHOT"
+    id("xyz.jpenilla.toothpick")
 }
 
 toothpick {
@@ -12,7 +9,7 @@ toothpick {
     groupId = "net.pl3x.purpur"
     forkUrl = "https://github.com/pl3xgaming/Purpur"
     val versionTag = System.getenv("BUILD_NUMBER")
-        ?: "\"${gitCmd("rev-parse", "--short", "HEAD").output}\""
+        ?: "\"${commitHash() ?: error("Could not obtain git hash")}\""
     forkVersion = "git-$forkName-$versionTag"
 
     minecraftVersion = "1.16.5"
@@ -23,11 +20,11 @@ toothpick {
     upstreamBranch = "origin/master"
 
     server {
-        project = project(":$forkNameLowercase-server")
+        project = projects.purpurServer.dependencyProject
         patchesDir = rootProject.projectDir.resolve("patches/server")
     }
     api {
-        project = project(":$forkNameLowercase-api")
+        project = projects.purpurApi.dependencyProject
         patchesDir = rootProject.projectDir.resolve("patches/api")
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e33bf0a93..2e134c774 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,29 +1,20 @@
+import xyz.jpenilla.toothpick.setupToothpickProject
 import java.util.Locale
 
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        jcenter()
         maven("https://repo.jpenilla.xyz/snapshots")
     }
 }
 
+plugins {
+    id("xyz.jpenilla.toothpick.settings") version "1.1.0-SNAPSHOT"
+}
+
 val forkName = "Purpur"
-val forkNameLowercase = forkName.toLowerCase(Locale.ENGLISH)
-
-rootProject.name = forkNameLowercase
-
-setupSubproject("$forkNameLowercase-api") {
-    projectDir = file("$forkName-API")
-    buildFileName = "../subprojects/api.gradle.kts"
-}
-setupSubproject("$forkNameLowercase-server") {
-    projectDir = file("$forkName-Server")
-    buildFileName = "../subprojects/server.gradle.kts"
-}
-
-inline fun setupSubproject(name: String, block: ProjectDescriptor.() -> Unit) {
-    include(name)
-    project(":$name").apply(block)
-}
+rootProject.name = forkName.toLowerCase(Locale.ROOT)
+setupToothpickProject(rootProject, forkName)