From d2b8eb8d63a3975c4231cec01a07f7cf9f0403f9 Mon Sep 17 00:00:00 2001 From: shueja-personal Date: Fri, 11 Oct 2024 19:15:32 -0700 Subject: [PATCH 1/2] Change version to 2025.0.0-beta-3 --- Cargo.lock | 6 +++--- package.json | 4 ++-- src-cli/Cargo.toml | 2 +- src-core/Cargo.toml | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 18 +++++++++++++----- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 687a366285..306246ca17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "choreo" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" dependencies = [ "built", "choreo-core", @@ -391,7 +391,7 @@ dependencies = [ [[package]] name = "choreo-cli" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" dependencies = [ "choreo-core", "clap", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "choreo-core" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" dependencies = [ "dashmap", "fastrand", diff --git a/package.json b/package.json index a05a74fec0..363990b038 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "choreo", - "version": "2025.0.0-beta-2", + "version": "2025.0.0-beta-3", "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": { @@ -67,4 +67,4 @@ "typescript": "^5.6.2", "vite": "^5.4.8" } -} +} \ No newline at end of file diff --git a/src-cli/Cargo.toml b/src-cli/Cargo.toml index 54b4869e4c..4ec4663b25 100644 --- a/src-cli/Cargo.toml +++ b/src-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo-cli" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" 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 2c9f444552..249bfc7946 100644 --- a/src-core/Cargo.toml +++ b/src-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo-core" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" 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 21c9791b9e..586ba30dfc 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "choreo" -version = "2025.0.0-beta.2" +version = "2025.0.0-beta.3" 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 c3b4c63e6d..5a013d5fd2 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-2" + "version": "2025.0.0-beta-3" }, "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,10 +71,10 @@ { "fullscreen": false, "resizable": true, - "title": "Choreo v2025.0.0-beta-2", + "title": "Choreo v2025.0.0-beta-3", "width": 1200, "height": 800 } ] } -} +} \ No newline at end of file From 6867abf3a84f8ddddf237c2af6c95eb4b658bb56 Mon Sep 17 00:00:00 2001 From: shueja-personal Date: Fri, 11 Oct 2024 19:26:30 -0700 Subject: [PATCH 2/2] Format --- .vscode/settings.json | 9 +++++++++ package.json | 2 +- src-tauri/tauri.conf.json | 14 +++----------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f315a0616f..e60870477e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,4 +2,13 @@ "rust-analyzer.check.overrideCommand": [ "cargo", "clippy", "--target-dir", "./target/clippy" ], + "files.associations": { + "*.traj": "json", + "vector": "cpp", + "array": "cpp", + "deque": "cpp", + "map": "cpp", + "unordered_map": "cpp", + "xstring": "cpp" + }, } diff --git a/package.json b/package.json index 363990b038..6e37e26597 100644 --- a/package.json +++ b/package.json @@ -67,4 +67,4 @@ "typescript": "^5.6.2", "vite": "^5.4.8" } -} \ No newline at end of file +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5a013d5fd2..7f609d44f9 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 @@ -77,4 +69,4 @@ } ] } -} \ No newline at end of file +}