Fix parsing Gradle version with zero
(cherry picked from commit 732972c)
This commit is contained in:
+1
-1
@@ -43,7 +43,7 @@ internal data class ParsedGradleVersion(val major: Int, val minor: Int) : Compar
|
||||
?.let { if (it.all { (it?.value?.length ?: 0).let { it > 0 && it < 4 }}) it else null }
|
||||
|
||||
val versions = matches?.mapNotNull { it?.value?.parseIntOrNull() } ?: emptyList()
|
||||
if (versions.size == 2 && versions.all { it > 0 }) {
|
||||
if (versions.size == 2 && versions.all { it >= 0 }) {
|
||||
val (major, minor) = versions
|
||||
return ParsedGradleVersion(major, minor)
|
||||
}
|
||||
|
||||
+2
@@ -29,6 +29,7 @@ class GradleVersionTest {
|
||||
assertEquals(2 to 14, "2.14.1".parseToPair())
|
||||
assertEquals(3 to 2, "3.2-rc-1".parseToPair())
|
||||
assertEquals(3 to 2, "3.2".parseToPair())
|
||||
assertEquals(4 to 0, "4.0".parseToPair())
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -37,5 +38,6 @@ class GradleVersionTest {
|
||||
assert(ParsedGradleVersion(3, 2) > ParsedGradleVersion(2, 14))
|
||||
assert(ParsedGradleVersion(3, 2) > ParsedGradleVersion(3, 1))
|
||||
assert(ParsedGradleVersion(3, 2) < ParsedGradleVersion(3, 3))
|
||||
assert(ParsedGradleVersion(4, 0) > ParsedGradleVersion(3, 3))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user