Merge pull request #14602 from rmuir/buildSrc

add groovy build code (buildSrc/) in 'gradle eclipse'
This commit is contained in:
Robert Muir 2015-11-07 15:41:05 -05:00
commit 5164ec8c20
2 changed files with 7 additions and 1 deletions

View File

@ -192,4 +192,10 @@ allprojects {
tasks.eclipse.dependsOn(copyEclipseSettings)
}
// add buildSrc itself as a groovy project
task buildSrcEclipse(type: GradleBuild) {
buildFile = 'buildSrc/build.gradle'
tasks = ['cleanEclipse', 'eclipse']
}
tasks.eclipse.dependsOn(buildSrcEclipse)

View File

@ -25,7 +25,7 @@ class TestReportLogger extends TestsSummaryEventListener implements AggregatedEv
static final String FAILURE_MARKER = " <<< FAILURES!"
/** Status names column. */
static EnumMap<TestStatus, String> statusNames;
static EnumMap<? extends TestStatus, String> statusNames;
static {
statusNames = new EnumMap<>(TestStatus.class);
for (TestStatus s : TestStatus.values()) {