[fix] Semantic Versioning regex update (#93)

* rolling release test * regex update
JetBrains · Aug 26, 2021 · c25a04f · c25a04f
1 parent bc595b2
commit c25a04f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/data/SemanticVersion.java b/bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/data/SemanticVersion.java
@@ -7,7 +7,7 @@
 public class SemanticVersion implements Comparable<SemanticVersion> {
 
   private static final String SEMANTIC_VERSION_REGEX =
-      "^([0-9]+)\\.([0-9]+)\\.([0-9]+)[\\-a-zA-Z]*";
+      "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$";
   private static final int MAJOR_VERSION_GROUP_ID = 1;
   private static final int MINOR_VERSION_GROUP_ID = 2;
   private static final int PATCH_VERSION_GROUP_ID = 3;

diff --git a/bazelrunner/src/test/java/org/jetbrains/bsp/bazel/bazelrunner/data/SemanticVersionTest.java b/bazelrunner/src/test/java/org/jetbrains/bsp/bazel/bazelrunner/data/SemanticVersionTest.java
@@ -38,4 +38,13 @@ public void shouldParseHomebrewVersion() {
     assertEquals(2, version.getMinorVersion());
     assertEquals(3, version.getPatchVersion());
   }
+
+  @Test
+  public void shouldParseRollingRelease() {
+    SemanticVersion version = new SemanticVersion("5.0.0-pre.20210817.2");
+
+    assertEquals(5, version.getMajorVersion());
+    assertEquals(0, version.getMinorVersion());
+    assertEquals(0, version.getPatchVersion());
+  }
 }