From 197cb12be273cce67a568b8895b76dcfcd285cf0 Mon Sep 17 00:00:00 2001 From: Zoe Gidiere Date: Wed, 9 Oct 2024 15:28:52 -0600 Subject: [PATCH] Update fabric versions to 1.21.2-pre1 --- buildSrc/src/main/kotlin/Versions.kt | 10 ++++++---- platforms/bukkit/common/build.gradle.kts | 2 +- platforms/fabric/build.gradle.kts | 4 ++-- platforms/mixin-lifecycle/build.gradle.kts | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e95d6f6be..e0eb26691 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,8 +9,6 @@ object Versions { const val strata = "1.3.2" const val cloud = "2.0.0" - const val cloudPaper = "2.0.0-beta.10" - const val cloudFabric = "2.0.0-beta.9" const val caffeine = "3.1.8" @@ -30,7 +28,9 @@ object Versions { } object Fabric { - const val fabricAPI = "0.104.0+${Mod.minecraft}" +// const val fabricAPI = "0.104.0+${Mod.minecraft}" + const val fabricAPI = "0.105.3+1.21.2" + const val cloud = "2.0.0-beta.9" } // // object Quilt { @@ -41,12 +41,13 @@ object Versions { object Mod { const val mixin = "0.15.3+mixin.0.8.7" - const val minecraft = "1.21.1" + const val minecraft = "1.21.2-pre1" const val yarn = "$minecraft+build.3" const val fabricLoader = "0.16.5" const val architecuryLoom = "1.7.413" const val architecturyPlugin = "3.4.159" + } // // object Forge { @@ -63,6 +64,7 @@ object Versions { const val paperDevBundle = paperBuild const val runPaper = "2.3.1" const val paperWeight = "1.7.2" + const val cloud = "2.0.0-beta.10" } // diff --git a/platforms/bukkit/common/build.gradle.kts b/platforms/bukkit/common/build.gradle.kts index eaf1956cb..fb3b1cc8f 100644 --- a/platforms/bukkit/common/build.gradle.kts +++ b/platforms/bukkit/common/build.gradle.kts @@ -11,5 +11,5 @@ dependencies { shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava) - shadedApi("org.incendo", "cloud-paper", Versions.Libraries.cloudPaper) + shadedApi("org.incendo", "cloud-paper", Versions.Bukkit.cloud) } diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 631424699..ce627df4f 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -26,8 +26,8 @@ dependencies { modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}") - modImplementation("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric) - include("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric) + modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud) + include("org.incendo", "cloud-fabric", Versions.Fabric.cloud) modRuntimeOnly("net.fabricmc.fabric-api", "fabric-api", Versions.Fabric.fabricAPI) } diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index b7d209b7f..35461fc0a 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}") mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2") - modImplementation("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric) { + modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud) { exclude("net.fabricmc") exclude("net.fabricmc.fabric-api") }