Skip to content

Commit bd023ba

Browse files
committed
Fix Jankson being shadowed to the wrong package in Forge and NeoForge
1 parent 50e7fea commit bd023ba

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 5.0.0.7
2+
- Fix Jankson being shadowed to the wrong package in Forge and NeoForge
3+
14
# 5.0.0.6
25
- Fix Jankson being shadowed to the wrong package in Fabric
36

Forge/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ dependencies {
5050
"shadowBundle"(project(":Common", "transformProductionForge")) { isTransitive = false }
5151

5252
implementation("blue.endless:jankson:${project.properties["jankson_version"]}")?.let { "shadowBundle"(it) }
53-
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
5453
}
5554

5655
tasks {
@@ -66,7 +65,7 @@ tasks {
6665
exclude("architectury.common.json")
6766
configurations = listOf(project.configurations.getByName("shadowBundle"))
6867
archiveClassifier.set("dev-shadow")
69-
relocate("blue.endless.jankson", "${project.group}.shadow.blue.endless.jankson")
68+
relocate("blue.endless.jankson", "corgitaco.corgilib.shadow.blue.endless.jankson")
7069
}
7170

7271
remapJar {

NeoForge/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ tasks {
6363
exclude("architectury.common.json", "dev/corgi/corgilib/neoforge/datagen/**")
6464
configurations = listOf(project.configurations.getByName("shadowBundle"))
6565
archiveClassifier.set("dev-shadow")
66-
relocate("blue.endless.jankson", "${project.group}.shadow.blue.endless.jankson")
66+
relocate("blue.endless.jankson", "corgitaco.corgilib.shadow.blue.endless.jankson")
6767
}
6868

6969
remapJar {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project
2-
version=5.0.0.6
2+
version=5.0.0.7-SNAPSHOT
33
group=dev.corgitaco
44
archives_base_name=Corgilib
55

0 commit comments

Comments
 (0)