first pass of merging in warp (doesn't build)

crates/galaxyui_extras/Cargo.toml

@@ -10,7 +10,7 @@ license.workspace = true
 default = ["secure_storage", "user_preferences", "user_preferences-file"]
 secure_storage = ["dep:security-framework", "dep:secret-service", "dep:ouroboros"]
 test-util = []
-user_preferences = ["dep:cocoa", "dep:objc", "dep:gloo-storage"]
+user_preferences = ["dep:objc2", "dep:objc2-foundation", "dep:gloo-storage"]
 user_preferences-file = ["user_preferences", "dep:serde", "dep:serde_json"]
 user_preferences-toml = ["user_preferences", "dep:serde", "dep:serde_json", "dep:toml_edit"]
 
@@ -23,7 +23,7 @@ serde_json = { workspace = true, optional = true }
 sha2.workspace = true
 toml_edit = { workspace = true, optional = true }
 thiserror.workspace = true
-galaxyui.workspace = true
+galaxyui_core.workspace = true
 
 [dev-dependencies]
 # Enable the `test-util` feature for our own package when running tests.
@@ -31,11 +31,14 @@ galaxyui_extras = { path = ".", features = ["test-util"] }
 tempfile.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa = { workspace = true, optional = true }
-objc = { workspace = true, optional = true }
+objc2 = { workspace = true, optional = true }
+objc2-foundation = { workspace = true, optional = true, features = [
+    "NSString",
+    "NSUserDefaults",
+] }
 security-framework = { version = "2.0.0", optional = true }
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 ouroboros = { version = "0.18", optional = true }
 rand = "0.8.5"
 ring = "0.17.13"