Update Toothpick to 1.1.0-SNAPSHOT

This commit is contained in:
jmp
2021-05-25 13:07:46 -07:00
committed by Jason
parent a08d74700d
commit 2aacc76669
2 changed files with 13 additions and 25 deletions

View File

@@ -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")
}
}

View File

@@ -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)