From 03cf13705ef075c15c59d438dc65db706bb51f73 Mon Sep 17 00:00:00 2001 From: "Nataliya.Valtman" Date: Wed, 6 Dec 2023 22:07:50 +0100 Subject: [PATCH] Support "beta + number" library versions #KT-64122 Fixed --- .../kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt | 4 ++-- .../org/jetbrains/kotlin/statistics/MetricPolicyTest.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt index 278d1dabb46..33b56471c34 100644 --- a/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt +++ b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt @@ -28,8 +28,8 @@ fun anonymizeComponentVersion(version: String): String { val mainVersion = parts.take(3).map { s -> s.toIntOrNull()?.toString() ?: "0" } val suffix = when { - parts[3].matches("(rc|m)\\d{0,1}".toRegex()) -> "-${parts[3]}" - parts[3].matches("(snapshot|dev|beta)".toRegex()) -> "-${parts[3]}" + parts[3].matches("(rc|m|beta)\\d{0,1}".toRegex()) -> "-${parts[3]}" + parts[3].matches("(snapshot|dev)".toRegex()) -> "-${parts[3]}" else -> "" } return mainVersion.joinToString(".") + suffix diff --git a/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/org/jetbrains/kotlin/statistics/MetricPolicyTest.kt b/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/org/jetbrains/kotlin/statistics/MetricPolicyTest.kt index d2c8858de4a..10d571f202f 100644 --- a/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/org/jetbrains/kotlin/statistics/MetricPolicyTest.kt +++ b/libraries/tools/kotlin-gradle-statistics/src/test/kotlin/org/jetbrains/kotlin/statistics/MetricPolicyTest.kt @@ -55,6 +55,7 @@ class MetricPolicyTest { assertEquals("2.0.255-snapshot", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("2.0.255-SNAPSHOT")) assertEquals("2.0.255-beta", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("2.0.255-beta")) + assertEquals("2.0.255-beta1", StringAnonymizationPolicy.ComponentVersionAnonymizer().anonymize("2.0.255-beta1")) } @Test