DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bundle Gson on 1.11.2 and below (fixes #421)

Browse Source 
Decided to go with 1.11.2 because the Gson from that version is the first to not
have the JsonAdapter annotiation, which we want for fixing #520.
This commit is contained in:
Jonas Herzig
2021-06-05 18:06:06 +02:00
parent e380907334
commit 9d3583293b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -228,7 +228,7 @@ def shadeExclusions = {
// Cannot just add these to the shade configuration because they'd be inherited by the compile configuration then // Cannot just add these to the shade configuration because they'd be inherited by the compile configuration then
exclude group: 'com.google.guava', module: 'guava-jdk5' exclude group: 'com.google.guava', module: 'guava-jdk5'
exclude group: 'com.google.guava', module: 'guava' // provided by MC exclude group: 'com.google.guava', module: 'guava' // provided by MC
exclude group: 'com.google.code.gson', module: 'gson' // provided by MC exclude group: 'com.google.code.gson', module: 'gson' // provided by MC (or manually bundled for 1.11.2 and below)
} }
dependencies { dependencies {
@@ -312,6 +312,11 @@ dependencies {
} }
} }
if (mcVersion < 11200) {
// The version which MC ships is too old, we'll need to ship our own
shadow 'com.google.code.gson:gson:2.8.7'
}
shadow 'com.github.javagl.JglTF:jgltf-model:3af6de4' shadow 'com.github.javagl.JglTF:jgltf-model:3af6de4'
if (FABRIC) { if (FABRIC) {