From 1891fba7534c69431247739febddd4346d55b5ef Mon Sep 17 00:00:00 2001 From: Jade Turner Date: Tue, 15 Oct 2024 10:13:14 +0800 Subject: [PATCH 1/3] Bump version to v2025.0.0-beta-4 Signed-off-by: Jade Turner --- package.json | 2 +- src-cli/Cargo.toml | 2 +- src-core/Cargo.toml | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 16 ++++++++++++---- update_version.py | 2 ++ 6 files changed, 18 insertions(+), 8 deletions(-) mode change 100644 => 100755 update_version.py diff --git a/package.json b/package.json index 6e37e26597..f747f58a04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "choreo", - "version": "2025.0.0-beta-3", + "version": "2025.0.0-beta-4", "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 index 4ec4663b25..ce213e24b4 100644 --- a/src-cli/Cargo.toml +++ b/src-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo-cli" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" 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 index 249bfc7946..0680e0f27f 100644 --- a/src-core/Cargo.toml +++ b/src-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo-core" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" 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 index 586ba30dfc..b0ce264e75 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" 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 index 7f609d44f9..cef4b058f0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Choreo", - "version": "2025.0.0-beta-3" + "version": "2025.0.0-beta-4" }, "tauri": { "allowlist": { @@ -40,7 +40,13 @@ }, "bundle": { "active": true, - "targets": ["appimage", "deb", "dmg", "nsis", "rpm"], + "targets": [ + "appimage", + "deb", + "dmg", + "nsis", + "rpm" + ], "identifier": "org.sleipnirgroup", "shortDescription": "Choreo", "icon": [ @@ -54,7 +60,9 @@ "minimumSystemVersion": "13.3", "signingIdentity": "-" }, - "externalBin": ["../target/choreo-cli"] + "externalBin": [ + "../target/choreo-cli" + ] }, "security": { "csp": null @@ -63,7 +71,7 @@ { "fullscreen": false, "resizable": true, - "title": "Choreo v2025.0.0-beta-3", + "title": "Choreo v2025.0.0-beta-4", "width": 1200, "height": 800 } diff --git a/update_version.py b/update_version.py old mode 100644 new mode 100755 index 11e5853db0..cab44029dd --- a/update_version.py +++ b/update_version.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + """ A utility script to update the version in multiple files. From b2a7a418bce99f7cf22249918eb819dd9d767007 Mon Sep 17 00:00:00 2001 From: Jade Turner Date: Tue, 15 Oct 2024 10:24:23 +0800 Subject: [PATCH 2/3] fmt Signed-off-by: Jade Turner --- src-tauri/tauri.conf.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index cef4b058f0..dea09f32a0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -40,13 +40,7 @@ }, "bundle": { "active": true, - "targets": [ - "appimage", - "deb", - "dmg", - "nsis", - "rpm" - ], + "targets": ["appimage", "deb", "dmg", "nsis", "rpm"], "identifier": "org.sleipnirgroup", "shortDescription": "Choreo", "icon": [ @@ -60,9 +54,7 @@ "minimumSystemVersion": "13.3", "signingIdentity": "-" }, - "externalBin": [ - "../target/choreo-cli" - ] + "externalBin": ["../target/choreo-cli"] }, "security": { "csp": null From b881f322840dae88a87b308fcf2f27ca342c103d Mon Sep 17 00:00:00 2001 From: Jade Turner Date: Tue, 15 Oct 2024 10:32:47 +0800 Subject: [PATCH 3/3] fix Signed-off-by: Jade Turner --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 306246ca17..664d489389 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "choreo" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" dependencies = [ "built", "choreo-core", @@ -391,7 +391,7 @@ dependencies = [ [[package]] name = "choreo-cli" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" dependencies = [ "choreo-core", "clap", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "choreo-core" -version = "2025.0.0-beta.3" +version = "2025.0.0-beta.4" dependencies = [ "dashmap", "fastrand",