Merge branch 'zed2' into zed2-workspace

crates/zed2/Cargo.toml

@@ -43,7 +43,7 @@ fuzzy = { path = "../fuzzy" }
 # go_to_line = { path = "../go_to_line" }
 gpui2 = { path = "../gpui2" }
 install_cli = { path = "../install_cli" }
-# journal = { path = "../journal" }
+journal2 = { path = "../journal2" }
 language2 = { path = "../language2" }
 # language_selector = { path = "../language_selector" }
 lsp = { path = "../lsp" }

crates/zed2/build.rs

@@ -0,0 +1,24 @@
+fn main() {
+    println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
+
+    if let Ok(value) = std::env::var("ZED_PREVIEW_CHANNEL") {
+        println!("cargo:rustc-env=ZED_PREVIEW_CHANNEL={value}");
+    }
+
+    if std::env::var("ZED_BUNDLE").ok().as_deref() == Some("true") {
+        // Find WebRTC.framework in the Frameworks folder when running as part of an application bundle.
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path/../Frameworks");
+    } else {
+        // Find WebRTC.framework as a sibling of the executable when running outside of an application bundle.
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+    }
+
+    // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+.
+    println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit");
+
+    // Seems to be required to enable Swift concurrency
+    println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");
+
+    // Register exported Objective-C selectors, protocols, etc
+    println!("cargo:rustc-link-arg=-Wl,-ObjC");
+}

crates/zed2/src/main.rs

@@ -188,7 +188,7 @@ fn main() {
         // workspace::init(app_state.clone(), cx);
         // recent_projects::init(cx);
 
-        // journal::init(app_state.clone(), cx);
+        // journal2::init(app_state.clone(), cx);
         // language_selector::init(cx);
         // theme_selector::init(cx);
         // activity_indicator::init(cx);