Fixed ListProductReleasesTask to return only significant versions f…

…or Android Studio #928
JetBrains · Mar 28, 2022 · 2d23887 · 2d23887
1 parent f6ae5c7
commit 2d23887
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## next
 - Make IDEA products releases cached hourly [#848](../../issues/848)
+- Fixed `ListProductReleasesTask` to return only significant versions for Android Studio [#928](../../issues/928)
 
 ## 1.5.0
 - Include Android Studio builds in the `ListProductsReleasesTask` results

diff --git a/src/main/kotlin/org/jetbrains/intellij/tasks/ListProductsReleasesTask.kt b/src/main/kotlin/org/jetbrains/intellij/tasks/ListProductsReleasesTask.kt
@@ -119,9 +119,11 @@ open class ListProductsReleasesTask @Inject constructor(
                     testVersion(version, build)
                 }
                 .filter { channels.contains(Channel.valueOf(it.channel.toUpperCase())) }
-                .groupBy { it.version }
+                .groupBy { it.version.split('.').dropLast(1).joinToString(".") }
                 .mapNotNull { entry ->
-                    entry.value.maxByOrNull { it.platformBuild?.let(::parse) ?: Version() }
+                    entry.value.maxByOrNull {
+                        it.version.split('.').last().toInt()
+                    }
                 }
                 .map { "AI-${it.version}" }
                 .toList()

diff --git a/src/test/kotlin/org/jetbrains/intellij/tasks/ListProductsReleasesTaskSpec.kt b/src/test/kotlin/org/jetbrains/intellij/tasks/ListProductsReleasesTaskSpec.kt
@@ -207,6 +207,23 @@ class ListProductsReleasesTaskSpec : IntelliJPluginSpecBase() {
         )
     }
 
+    @Test
+    fun `get Android Studio releases for all channels`() {
+        buildFile.groovy("""
+            listProductsReleases {
+                sinceVersion = "2021.1"
+                types = ["AI"]
+            }
+        """)
+
+        val result = build(IntelliJPluginConstants.LIST_PRODUCTS_RELEASES_TASK_NAME)
+
+        assertEquals(
+            listOf("AI-2021.3.1.7", "AI-2021.2.1.11", "AI-2021.1.1.22"),
+            result.taskOutput()
+        )
+    }
+
     @Test
     fun `reuse configuration cache`() {
         build(IntelliJPluginConstants.LIST_PRODUCTS_RELEASES_TASK_NAME, "--configuration-cache")