Skip to content

Commit

Permalink
πŸ› fix a dependency conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
umjammer committed Dec 14, 2023
1 parent 9db339a commit 83b0678
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down

0 comments on commit 83b0678

Please sign in to comment.