diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 06ce4a579..07713bb5b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,6 +3,15 @@ plugins { kotlin("jvm") version embeddedKotlinVersion } +buildscript { + configurations.all { + resolutionStrategy { + force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version + force("org.ow2.asm:asm-commons:9.3") + } + } +} + repositories { mavenCentral() gradlePluginPortal() @@ -11,8 +20,8 @@ repositories { dependencies { implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+") - implementation("org.ow2.asm:asm:9.2") - implementation("org.ow2.asm:asm-tree:9.2") + implementation("org.ow2.asm:asm:9.3") + implementation("org.ow2.asm:asm-tree:9.3") implementation("com.dfsek.tectonic:common:4.2.0") implementation("org.yaml:snakeyaml:1.27") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 01e403932..636159219 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -19,9 +19,9 @@ object Versions { object Fabric { const val fabricLoader = "0.14.2" - const val fabricAPI = "0.53.4+1.18.2" - const val minecraft = "1.18.2" - const val yarn = "$minecraft+build.3" + const val fabricAPI = "0.53.4+1.19" + const val minecraft = "1.19-pre4" + const val yarn = "$minecraft+build.1" const val permissionsAPI = "0.1-SNAPSHOT" } diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index ab993acda..802e2a752 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { modImplementation("net.fabricmc:fabric-loader:${Versions.Fabric.fabricLoader}") - setOf("fabric-command-api-v1", "fabric-lifecycle-events-v1", "fabric-resource-loader-v0", "fabric-api-base").forEach { apiModule -> + setOf("fabric-command-api-v2", "fabric-lifecycle-events-v1", "fabric-resource-loader-v0", "fabric-api-base").forEach { apiModule -> val module = fabricApi.module(apiModule, Versions.Fabric.fabricAPI) modImplementation(module) include(module)