From c4e7f1aa972748fa38e4d6f9192708cecd3ebef4 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Fri, 30 Jun 2017 20:41:16 +0300 Subject: [PATCH] Fix parsing Gradle version with zero (cherry picked from commit 732972c) --- .../org/jetbrains/kotlin/gradle/utils/ParsedGradleVersion.kt | 2 +- .../org/jetbrains/kotlin/gradle/utils/GradleVersionTest.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/ParsedGradleVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/ParsedGradleVersion.kt index 01a46568ab3..d8c077034a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/ParsedGradleVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/ParsedGradleVersion.kt @@ -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) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/utils/GradleVersionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/utils/GradleVersionTest.kt index dd4eda27d78..06441c0ad55 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/utils/GradleVersionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/utils/GradleVersionTest.kt @@ -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)) } } \ No newline at end of file