From 83b0678744be7b421fbe263e7527332cc7d80938 Mon Sep 17 00:00:00 2001 From: Naohide Sano Date: Thu, 14 Dec 2023 10:49:18 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20a=20dependency=20conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- build.gradle | 2 ++ gradle.properties | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1a79801..45bc8f3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Fabric](https://img.shields.io/badge/Mod_Loader-Fabric-blue)](https://fabricmc.net/) -[![Minecraft](https://img.shields.io/badge/Minecraft-1.20.2-green)](https://www.minecraft.net/) +[![Minecraft](https://img.shields.io/badge/Minecraft-1.20.4-green)](https://www.minecraft.net/) [![Java CI](https://github.com/umjammer/zundamod/actions/workflows/build.yml/badge.svg)](https://github.com/umjammer/zundamod/actions/workflows/build.yml) [![GitHub Release Assets](https://github.com/umjammer/zundamod/actions/workflows/publish.yml/badge.svg)](https://github.com/umjammer/zundamod/actions/workflows/publish.yml) ![Java](https://img.shields.io/badge/Java-17-b07219) diff --git a/build.gradle b/build.gradle index 75dfd7c..8b7f995 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ dependencies { exclude group: "sen", module: "sen" exclude group: "com.github.umjammer", module: "vavi-commons-sandbox" exclude group: "com.github.umjammer.vavi-commons", module: "vavi-instrumentation" + exclude group: "org.ow2.asm", module: "asm" } dependencyJars ("vavi:vavi-speech2:0.0.9") { // TODO how to copy this from implementation or use implementation w/o error exclude group: "org.jvoicexml", module: "freetts_jsapi10" @@ -66,6 +67,7 @@ dependencies { exclude group: "sen", module: "sen" exclude group: "com.github.umjammer", module: "vavi-commons-sandbox" exclude group: "com.github.umjammer.vavi-commons", module: "vavi-instrumentation" + exclude group: "org.ow2.asm", module: "asm" } // TODO HEY! HEY! HEY! Mr. fabric-loom, make include work recursively. my dependency jars are over 100! configurations.dependencyJars.incoming.resolutionResult.allDependencies diff --git a/gradle.properties b/gradle.properties index 04709a3..a681681 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.1 +yarn_mappings=1.20.4+build.3 loader_version=0.15.1 # Mod Properties diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 155c544..6ef488b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "zundamod.mixins.json" ], "depends": { - "fabricloader": ">=0.14.21", - "minecraft": "~1.20.1", + "fabricloader": ">=0.15.1", + "minecraft": "~1.20.4", "java": ">=17", "fabric-api": "*" },