diff --git a/gradle.properties b/gradle.properties index 623b006fac..0fec65e48e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ group = io.papermc.paper version = 1.17-R0.1-SNAPSHOT mcVersion = 1.17 -packageVersion = 1_17_R1 org.gradle.parallel=true org.gradle.vfs.watch=false diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 9862961043..13e2d5f5bf 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -59,6 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + rename { "pom.xml" } + } + + val packageVersion = "1_17_R1" relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { exclude("org.bukkit.craftbukkit.Main*") } diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 5b78263eee..385a1e3c45 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -39,8 +39,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + id("com.github.johnrengelman.shadow") +} + -+val packageVersion = providers.gradleProperty("packageVersion").forUseAtConfigurationTime().get() -+ +repositories { + maven("https://libraries.minecraft.net/") +} @@ -101,6 +99,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +tasks.shadowJar { + archiveClassifier.set("mojang-mapped") + ++ val packageVersion = "1_17_R1" + relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { + exclude("org.bukkit.craftbukkit.Main*") + }