Re-enable and fix building for older MC versions

This commit is contained in:
Jonas Herzig
2019-03-02 18:11:01 +01:00
parent 528791c91f
commit 8705bbad9a
24 changed files with 142 additions and 84 deletions

View File

@@ -148,7 +148,7 @@ configurations {
shade
compile.extendsFrom shade
shade.exclude group: 'com.google.code.gson', module: 'gson' // provided by MC
// FIXME seems to be inherited now? shade.exclude group: 'com.google.code.gson', module: 'gson' // provided by MC
}
dependencies {
@@ -158,13 +158,19 @@ dependencies {
][mcVersion]
}
annotationProcessor group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
if (FG3) {
// FIXME gson should be bundled with MC, not sure why forge doesn't add it (probably related to above shade.exclude)
annotationProcessor group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
}
// compile 'com.github.SpongePowered:Mixin:404f5da' // 0.7.5-SNAPSHOT
// ^ mixin doesn't compile on jitpack, so we'll have to depend on the SNAPSHOT and build it manually for reprod
annotationProcessor 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
compileOnly 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
if (!gradle.gradleVersion.startsWith('3.')) {
annotationProcessor 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
compileOnly 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
}
compile 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
shade 'com.googlecode.mp4parser:isoparser:1.1.7'
shade 'org.apache.commons:commons-exec:1.3'
@@ -191,7 +197,9 @@ dependencies {
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
}
annotationProcessor 'org.projectlombok:lombok:1.16.6'
if (!gradle.gradleVersion.startsWith('3.')) {
annotationProcessor 'org.projectlombok:lombok:1.16.6'
}
compile 'org.projectlombok:lombok:1.16.6' // runtime only for @SneakyThrows which isn't used
testCompile 'junit:junit:4.11'