Merge branch 'master' into headless-api

CHANGELOG.md

@@ -2,14 +2,19 @@
 
 ## Unreleased Changes
 * Added headless API for Studio companion plugins. ([#631])
+
+[#631]: https://github.com/rojo-rbx/rojo/pull/631
+
+## [7.4.0] - January 16, 2024
 * Improved the visualization for array properties like Tags ([#829])
 * Significantly improved performance of `rojo serve`, `rojo build --watch`, and `rojo sourcemap --watch` on macOS. ([#830])
 * Changed *.lua files that init command generates to *.luau ([#831])
+* Does not remind users to sync if the sync lock is claimed already ([#833])
 
-[#631]: https://github.com/rojo-rbx/rojo/pull/631
 [#829]: https://github.com/rojo-rbx/rojo/pull/829
 [#830]: https://github.com/rojo-rbx/rojo/pull/830
 [#831]: https://github.com/rojo-rbx/rojo/pull/831
+[#833]: https://github.com/rojo-rbx/rojo/pull/833
 
 ## [7.4.0-rc3] - October 25, 2023
 * Changed `sourcemap --watch` to only generate the sourcemap when it's necessary ([#800])

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "7.4.0-rc3"
+version = "7.4.0"
 rust-version = "1.70.0"
 authors = ["Lucien Greathouse <[email protected]>"]
 description = "Enables professional-grade development tools for Roblox developers"
@@ -49,11 +49,11 @@ memofs = { version = "0.2.0", path = "crates/memofs" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "0.7.3"
-rbx_dom_weak = "2.6.0"
-rbx_reflection = "4.4.0"
-rbx_reflection_database = "0.2.8"
-rbx_xml = "0.13.2"
+rbx_binary = "0.7.4"
+rbx_dom_weak = "2.7.0"
+rbx_reflection = "4.5.0"
+rbx_reflection_database = "0.2.10"
+rbx_xml = "0.13.3"
 
 anyhow = "1.0.44"
 backtrace = "0.3.61"

build.rs

@@ -48,12 +48,8 @@ fn main() -> Result<(), anyhow::Error> {
     let plugin_version =
         Version::parse(fs::read_to_string(plugin_root.join("Version.txt"))?.trim())?;
 
-    assert!(
-        our_version.major == plugin_version.major,
-        "plugin version does not match Cargo version"
-    );
-    assert!(
-        our_version.minor == plugin_version.minor,
+    assert_eq!(
+        our_version, plugin_version,
         "plugin version does not match Cargo version"
     );
 

plugin/Version.txt

@@ -1 +1 @@
-7.4.0-rc3
+7.4.0