Skip to content

Commit

Permalink
fix: isolate macos-specific dependencies (#6854)
Browse files Browse the repository at this point in the history
Release Notes:
- N/A
  • Loading branch information
aminya authored Jan 27, 2024
1 parent 1f83b5c commit 0e4d947
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
3 changes: 0 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion crates/fsevent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ doctest = false

[dependencies]
bitflags = "1"
fsevent-sys = "3.0.2"
parking_lot.workspace = true

[target.'cfg(target_os = "macos")'.dependencies]
fsevent-sys = "3.0.2"

[dev-dependencies]
tempfile.workspace = true

Expand Down
13 changes: 10 additions & 3 deletions crates/fsevent/examples/events.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
use fsevent::EventStream;
use std::{env::args, path::Path, time::Duration};

#[cfg(target_os = "macos")]
fn main() {
use fsevent::EventStream;
use std::{env::args, path::Path, time::Duration};

let paths = args().skip(1).collect::<Vec<_>>();
let paths = paths.iter().map(Path::new).collect::<Vec<_>>();
assert!(!paths.is_empty(), "Must pass 1 or more paths as arguments");

let (stream, _handle) = EventStream::new(&paths, Duration::from_millis(100));
stream.run(|events| {
eprintln!("event batch");
Expand All @@ -14,3 +16,8 @@ fn main() {
true
});
}

#[cfg(not(target_os = "macos"))]
fn main() {
eprintln!("This example only works on macOS");
}
9 changes: 3 additions & 6 deletions crates/live_kit_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ media = { path = "../media" }

anyhow.workspace = true
async-broadcast = "0.4"
core-foundation = "0.9.3"
core-graphics = "0.22.3"
futures.workspace = true
log.workspace = true
parking_lot.workspace = true
Expand All @@ -41,6 +39,9 @@ postage.workspace = true
async-trait = { workspace = true, optional = true }
nanoid = { version ="0.4", optional = true}

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.9.3"

[dev-dependencies]
collections = { path = "../collections", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
Expand All @@ -53,14 +54,10 @@ async-trait.workspace = true
block = "0.1"
bytes = "1.2"
byteorder = "1.4"
cocoa = "0.25"
core-foundation = "0.9.3"
core-graphics = "0.22.3"
foreign-types = "0.3"
futures.workspace = true
hmac = "0.12"
jwt = "0.16"
objc = "0.2"
parking_lot.workspace = true
serde.workspace = true
serde_derive.workspace = true
Expand Down
5 changes: 4 additions & 1 deletion crates/live_kit_client/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ pub struct SwiftTarget {
const MACOS_TARGET_VERSION: &str = "10.15.7";

fn main() {
if cfg!(not(any(test, feature = "test-support"))) {
if cfg!(all(
target_os = "macos",
not(any(test, feature = "test-support"))
)) {
let swift_target = get_swift_target();

build_bridge(&swift_target);
Expand Down
6 changes: 4 additions & 2 deletions crates/media/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ doctest = false
anyhow.workspace = true
block = "0.1"
bytes = "1.2"
core-foundation = "0.9.3"
foreign-types = "0.3"
metal = "0.21.0"

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.9.3"
objc = "0.2"
metal = "0.21.0"

[build-dependencies]
bindgen = "0.65.1"

0 comments on commit 0e4d947

Please sign in to comment.