Use FG1.2 fork with Gradle 4.9 fixes so we can build everything at once

This commit is contained in:
Jonas Herzig
2019-05-07 17:55:59 +02:00
parent 362f61a337
commit 7b97d9ea85
10 changed files with 58 additions and 170 deletions

View File

@@ -26,7 +26,7 @@ if (releaseCommit == currentCommit) {
def diff = command('git', 'log', '--format=oneline', "$releaseCommit..$currentCommit").size()
version = "$latestVersion-$diff-g${currentCommit.substring(0, 7)}"
}
if (gitDescribe().endsWith('*') && !project.hasProperty('ignoreDirty')) {
if (gitDescribe().endsWith('*')) {
version = "$version-dirty"
}
@@ -61,24 +61,6 @@ subprojects {
}
}
// Workaround specific to CI build to guarantee correct ordering of
// ./gradlew --parallel shadowJar :1.8:setCoreVersion
// TODO properly fix the ordering in preprocessor
if (project.hasProperty('workAroundBuildOrder')) {
evaluationDependsOnChildren()
def rmTasks = project(':1.8').tasks
def jGuiTasks = project(':jGui:1.8').tasks
subprojects.forEach {
def shadowTask = it.tasks.findByName('shadowJar')
if (shadowTask != null) {
rmTasks.setCoreVersionJava.mustRunAfter shadowTask
rmTasks.setCoreVersionResources.mustRunAfter shadowTask
jGuiTasks.setCoreVersionJava.mustRunAfter shadowTask
jGuiTasks.setCoreVersionResources.mustRunAfter shadowTask
}
}
}
def gitDescribe() {
try {
def stdout = new ByteArrayOutputStream()