diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index cec2d002d..4867397a3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,8 +17,8 @@ repositories { dependencies { //TODO Allow pulling from Versions.kt implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1") - implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.2") + implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.16") implementation("org.ow2.asm", "asm", "9.7") implementation("org.ow2.asm", "asm-tree", "9.7") implementation("com.dfsek.tectonic", "common", "4.2.1") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 322516af6..cbbbcc989 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -44,8 +44,8 @@ object Versions { const val yarn = "$minecraft+build.8" const val fabricLoader = "0.16.10" - const val architecuryLoom = "1.7.413" - const val architecturyPlugin = "3.4.159" + const val architecuryLoom = "1.9.428" + const val architecturyPlugin = "3.4.161" } // @@ -56,13 +56,13 @@ object Versions { object Bukkit { const val minecraft = "1.21.4" - const val paperBuild = "$minecraft-R0.1-20241211.212446-17" + const val paperBuild = "$minecraft-R0.1-20250317.101324-208" const val paper = paperBuild const val paperLib = "1.0.8" const val reflectionRemapper = "0.1.1" const val paperDevBundle = paperBuild const val runPaper = "2.3.1" - const val paperWeight = "1.7.2" + const val paperWeight = "2.0.0-beta.16" const val cloud = "2.0.0-beta.10" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee2a..e1b837a19 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/platforms/bukkit/nms/v1_21_3/build.gradle.kts b/platforms/bukkit/nms/v1_21_3/build.gradle.kts index d52f1d169..31cad053a 100644 --- a/platforms/bukkit/nms/v1_21_3/build.gradle.kts +++ b/platforms/bukkit/nms/v1_21_3/build.gradle.kts @@ -1,8 +1,10 @@ -apply(plugin = "io.papermc.paperweight.userdev") +plugins { + id("io.papermc.paperweight.userdev") +} dependencies { api(project(":platforms:bukkit:common")) - paperDevBundle(Versions.Bukkit.paperDevBundle) + paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle) implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) }