AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-06-12 01:43:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lowercase project names and exclude paper-api from paper-mojangapi

Browse Source
This commit is contained in:
Jason Penilla
2021-12-02 20:58:35 -08:00
parent ad960f72e1
commit 74b34eec95
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0001-Build-changes.patch
View File

@ -5,21 +5,25 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466de50d3a18 100644
index cd74406039704e5a880f00b9b60bb7b1dedc5398..c4dfc34277e59143d346725c9ef2bfbcee59bc06 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -18,8 +18,12 @@ repositories {
}
dependencies {
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":ForkTest-API")) // ForkTest
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // ForkTest
+ // ForkTest start
+ implementation(project(":forktest-api"))
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
+ // ForkTest end
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -67,7 +67,7 @@ tasks.jar {
@@ -67,7 +71,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@ -28,7 +32,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466d
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -158,7 +158,7 @@ fun TaskContainer.registerRunTask(
@@ -158,7 +162,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {