diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index eaec594a4..47b630e2f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,10 +17,10 @@ repositories { dependencies { //TODO Allow pulling from Versions.kt implementation("com.github.johnrengelman", "shadow", "8.1.1") - implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6") + implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.10") - implementation("org.ow2.asm", "asm", "9.5") - implementation("org.ow2.asm", "asm-tree", "9.5") + implementation("org.ow2.asm", "asm", "9.6") + implementation("org.ow2.asm", "asm-tree", "9.6") implementation("com.dfsek.tectonic", "common", "4.2.0") implementation("org.yaml", "snakeyaml", "2.2") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt index 82b3b206b..84c5e19e4 100644 --- a/buildSrc/src/main/kotlin/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -54,11 +54,11 @@ fun Project.configureDependencies() { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0") - compileOnly("org.jetbrains:annotations:23.0.0") + testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit) + testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit) + compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations) - compileOnly("com.google.guava:guava:30.0-jre") - testImplementation("com.google.guava:guava:30.0-jre") + compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava) + testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava) } } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 28efbc1e6..34cb058db 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -11,17 +11,18 @@ object Versions { object Internal { const val shadow = "8.1.1" - const val apacheText = "1.10.0" - const val apacheIO = "2.14.0" + const val apacheText = "1.11.0" + const val apacheIO = "2.15.1" const val guava = "32.1.3-jre" - const val asm = "9.5" + const val asm = "9.6" const val snakeYml = "2.2" + const val jetBrainsAnnotations = "24.1.0" + const val junit = "5.10.1" } } object Fabric { - // const val fabricAPI = "0.90.0+${Mod.minecraft}" - const val fabricAPI = "0.91.1+1.20.3" + const val fabricAPI = "0.91.1+${Mod.minecraft}" } // // object Quilt { @@ -32,12 +33,12 @@ object Versions { object Mod { const val mixin = "0.12.5+mixin.0.8.5" - const val minecraft = "1.20.3-pre3" + const val minecraft = "1.20.3" const val yarn = "$minecraft+build.1" - const val fabricLoader = "0.14.25" + const val fabricLoader = "0.15.0" - const val architecuryLoom = "1.3.357" - const val architecturyPlugin = "3.4.146" + const val architecuryLoom = "1.4.367" + const val architecturyPlugin = "3.4.151" const val loomVineflower = "1.11.0" } @@ -48,14 +49,14 @@ object Versions { // } object Bukkit { - const val paper = "1.18.2-R0.1-SNAPSHOT" - const val paperLib = "1.0.5" + const val paper = "1.18.2-R0.1-20220920.010157-167" + const val paperLib = "1.0.8" const val foliaLib = "0.2.5" const val minecraft = "1.20.2" - const val reflectionRemapper = "0.1.0-SNAPSHOT" - const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT" - const val runPaper = "2.2.0" - const val paperWeight = "1.5.6" + const val reflectionRemapper = "0.1.0" + const val paperDevBundle = "1.20.2-R0.1-20231203.034718-121" + const val runPaper = "2.2.2" + const val paperWeight = "1.5.10" } // @@ -67,6 +68,6 @@ object Versions { // object CLI { const val nbt = "6.1" - const val logback = "1.4.11" + const val logback = "1.4.14" } } \ No newline at end of file diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 3598ae92c..dba268728 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -3,7 +3,6 @@ import java.util.* plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } architectury { diff --git a/platforms/mixin-common/build.gradle.kts b/platforms/mixin-common/build.gradle.kts index 031cd7159..2fb92233c 100644 --- a/platforms/mixin-common/build.gradle.kts +++ b/platforms/mixin-common/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } loom { diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index 490cdf687..a4e700412 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } dependencies {