diff options
| author | Nik Everett <nik9000@gmail.com> | 2017-05-18 09:33:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 09:33:13 -0400 |
| commit | 82d2c7a142d733b72ca320901343349c8f801a08 (patch) | |
| tree | f6d9892384c08b59a0b5892bc6bb41730e0d31fc /build.gradle | |
| parent | 96dac4c6704459522d9d2e1700355a4600fa5b94 (diff) | |
Remove vagrant testing versions (#24754)
Now that we generate the versions list from Versions.java we can
drop the list of versions maintained for vagrant testing. One nice
thing that the vagrant testing did was to check if the list of
versions was out of date. This moves that test to the core
project.
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index e2c1ff9f92..948bbcd080 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,8 @@ for (String line : versionLines) { int major = Integer.parseInt(match.group(1)) int minor = Integer.parseInt(match.group(2)) int bugfix = Integer.parseInt(match.group(3)) - Version foundVersion = new Version(major, minor, bugfix, false) + boolean unreleased = match.group(4) != null + Version foundVersion = new Version(major, minor, bugfix, false, unreleased) if (currentVersion != foundVersion) { versions.add(foundVersion) } @@ -88,7 +89,7 @@ for (String line : versionLines) { } } if (versions.toSorted { it.id } != versions) { - println "Versions: ${versions}" + println "Versions: ${versions}" throw new GradleException("Versions.java contains out of order version constants") } if (currentVersion.bugfix == 0) { @@ -97,7 +98,8 @@ if (currentVersion.bugfix == 0) { // unreleased version of closest branch. So for those cases, the version includes -SNAPSHOT, // and the bwc-zip distribution will checkout and build that version. Version last = versions[-1] - versions[-1] = new Version(last.major, last.minor, last.bugfix, true) + versions[-1] = new Version(last.major, last.minor, last.bugfix, + true, last.unreleased) } // injecting groovy property variables into all projects |