Update version to v2025.0.0 (#1114)

SleipnirGroup · Jan 6, 2025 · 97962cb · 97962cb
1 parent a947ef2
commit 97962cb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/choreolib/ChoreoLib2025.json b/choreolib/ChoreoLib2025.json
@@ -1,7 +1,7 @@
 {
   "fileName": "ChoreoLib2025.json",
   "name": "ChoreoLib",
-  "version": "2025.0.0-beta-9",
+  "version": "2025.0.0",
   "uuid": "b5e23f0a-dac9-4ad2-8dd6-02767c520aca",
   "frcYear": "2025",
   "mavenUrls": [
@@ -13,7 +13,7 @@
     {
       "groupId": "choreo",
       "artifactId": "ChoreoLib-java",
-      "version": "2025.0.0-beta-9"
+      "version": "2025.0.0"
     },
     {
       "groupId": "com.google.code.gson",
@@ -26,7 +26,7 @@
     {
       "groupId": "choreo",
       "artifactId": "ChoreoLib-cpp",
-      "version": "2025.0.0-beta-9",
+      "version": "2025.0.0",
       "libName": "ChoreoLib",
       "headerClassifier": "headers",
       "sharedLibrary": false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "choreo",
-  "version": "2025.0.0-beta-9",
+  "version": "2025.0.0",
   "description": "A graphical tool for planning time-optimized trajectories for autonomous mobile robots in the FIRST Robotics Competition.",
   "homepage": "https://github.com/SleipnirGroup/Choreo",
   "bugs": {

diff --git a/src-cli/Cargo.toml b/src-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "choreo-cli"
-version = "2025.0.0-beta.9"
+version = "2025.0.0"
 edition = "2021"
 homepage = "https://github.com/SleipnirGroup/Choreo"
 repository = "https://github.com/SleipnirGroup/Choreo.git"

diff --git a/src-core/Cargo.toml b/src-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "choreo-core"
-version = "2025.0.0-beta.9"
+version = "2025.0.0"
 edition = "2021"
 homepage = "https://github.com/SleipnirGroup/Choreo"
 repository = "https://github.com/SleipnirGroup/Choreo.git"

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "choreo"
-version = "2025.0.0-beta.9"
+version = "2025.0.0"
 edition = "2021"
 description = """\
   A graphical tool for planning time-optimized trajectories for autonomous \

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "Choreo",
-    "version": "2025.0.0-beta-9"
+    "version": "2025.0.0"
   },
   "tauri": {
     "allowlist": {
@@ -63,7 +63,7 @@
       {
         "fullscreen": false,
         "resizable": true,
-        "title": "Choreo v2025.0.0-beta-9",
+        "title": "Choreo v2025.0.0",
         "width": 1200,
         "height": 800
       }

diff --git a/update_version.py b/update_version.py
@@ -13,7 +13,11 @@
 
 
 def default_version_string(v: str, count: str, hash: str, mod: str, num: str):
-    return f"{v}-{mod}-{num}" if len(mod) > 0 else f"{v}-{count}-{hash}"
+    mod = f"-{mod}" if len(mod) > 0 else ""
+    num = f"-{num}" if len(num) > 0 else ""
+    count = f"-{count}" if len(count) > 0 else ""
+    hash = f"-{hash}" if len(hash) > 0 else ""
+    return f"{v}{mod}{num}" if len(mod) > 0 else f"{v}{count}{hash}"
 
 
 def cargo_version_string(v: str, count: str, hash: str, mod: str, num: str):