Fix setupCIWorkspace/setupDecompWorkspace

See the linked commits in our FG fork for details.

`:1.8:setupDecompWorkspace` (and only that one) still fails with an unrelated
NPE which I can't be bothered to fix.
This commit is contained in:
Jonas Herzig
2020-03-30 12:46:36 +02:00
parent 9107485c14
commit 190210f950
2 changed files with 8 additions and 10 deletions

2
jGui

Submodule jGui updated: a1c71294b1...a13e1e31c9

View File

@@ -35,16 +35,14 @@ buildscript {
classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){ classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){
exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one
} }
} else { } else if (mcVersion >= 10800) {
classpath('com.github.ReplayMod:ForgeGradle:' + ( classpath('com.github.ReplayMod:ForgeGradle:' + (
mcVersion >= 11200 ? 'd5c13801' : // FG 2.3 mcVersion >= 11200 ? 'b64de9c' : // FG 2.3
mcVersion >= 10904 ? 'bf0ea7b8' : // FG 2.2 mcVersion >= 10904 ? '5bb7a53' : // FG 2.2
mcVersion >= 10800 ? 'ab81684e' : // FG 2.1 'fc1eabc' // FG 2.1
'e93f77b4' // FG 1.2 ) + ':all')
)){ } else {
exclude group: 'net.sf.trove4j', module: 'trove4j' // preprocessor/idea requires more recent one classpath 'com.github.ReplayMod:ForgeGradle:e93f77b4' // FG 1.2
exclude group: 'trove', module: 'trove' // different name same thing
}
} }
} }
} }