diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs index 836d586c26bea742d7b31832d0b17b64d0295a05..3fb0119782cdd10aa8698362b8c6e9ce3812ff29 100644 --- a/crates/gpui/build.rs +++ b/crates/gpui/build.rs @@ -57,7 +57,7 @@ fn compile_metal_shaders() { "macosx", "metal", "-gline-tables-only", - "-mmacosx-version-min=10.14", + "-mmacosx-version-min=10.15.7", "-MO", "-c", shader_path, diff --git a/crates/live_kit_client/build.rs b/crates/live_kit_client/build.rs index 7d5b0944f1d979baca48cdb6f989a116a544b66b..4bbd61ac109749429340ef713ed31941c4121e2d 100644 --- a/crates/live_kit_client/build.rs +++ b/crates/live_kit_client/build.rs @@ -32,7 +32,7 @@ pub struct SwiftTarget { pub paths: SwiftPaths, } -const MACOS_TARGET_VERSION: &str = "10.15"; +const MACOS_TARGET_VERSION: &str = "10.15.7"; fn main() { if cfg!(not(any(test, feature = "test-support"))) { @@ -81,13 +81,9 @@ fn build_bridge(swift_target: &SwiftTarget) { } fn link_swift_stdlib(swift_target: &SwiftTarget) { - swift_target - .paths - .runtime_library_paths - .iter() - .for_each(|path| { - println!("cargo:rustc-link-search=native={}", path); - }); + for path in &swift_target.paths.runtime_library_paths { + println!("cargo:rustc-link-search=native={}", path); + } } fn link_webrtc_framework(swift_target: &SwiftTarget) { diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index e35bfabe109e55dabf49423206badeeeef2425a0..9a9c2fc5f16379067f2cb641eb59c7cc943ed9da 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -127,4 +127,4 @@ unindent = "0.1.7" icon = ["app-icon@2x.png", "app-icon.png"] identifier = "dev.zed.Zed" name = "Zed" -osx_minimum_system_version = "10.14" +osx_minimum_system_version = "10.15.7" diff --git a/crates/zed/build.rs b/crates/zed/build.rs index 9b486cbb8b95dacc56fc66f85d2b74ace1e99de8..c140f333f4ff7685eccb45df39b91d61faaa0644 100644 --- a/crates/zed/build.rs +++ b/crates/zed/build.rs @@ -1,7 +1,7 @@ use std::process::Command; fn main() { - println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.14"); + println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7"); if let Ok(api_key) = std::env::var("ZED_AMPLITUDE_API_KEY") { println!("cargo:rustc-env=ZED_AMPLITUDE_API_KEY={api_key}"); diff --git a/script/bundle b/script/bundle index a4a1391f2bca54b53a154c2ec355297015b8b10d..c9b663751e19ee063826716c23f0c5fbe0f22ac3 100755 --- a/script/bundle +++ b/script/bundle @@ -3,7 +3,7 @@ set -e export ZED_BUNDLE=true -export MACOSX_DEPLOYMENT_TARGET=10.14 +export MACOSX_DEPLOYMENT_TARGET=10.15.7 echo "Installing cargo bundle" cargo install cargo-bundle --version 0.5.0 @@ -12,10 +12,13 @@ rustup target add wasm32-wasi # Deal with versions of macOS that don't include libstdc++ headers export CXXFLAGS="-stdlib=libc++" -echo "Compiling binaries" +echo "Compiling zed binary for aarch64-apple-darwin" cargo build --release --package zed --target aarch64-apple-darwin +echo "Compiling zed binary for x86_64-apple-darwin" cargo build --release --package zed --target x86_64-apple-darwin +echo "Compiling cli binary for aarch64-apple-darwin" cargo build --release --package cli --target aarch64-apple-darwin +echo "Compiling cli binary for x86_64-apple-darwin" cargo build --release --package cli --target x86_64-apple-darwin echo "Creating application bundle"