zed 0.77.1

Add terms of use to DMG in the bundle script

Cargo.lock

@@ -8409,7 +8409,7 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "zed"
-version = "0.77.0"
+version = "0.77.1"
 dependencies = [
  "activity_indicator",
  "anyhow",

crates/feedback/Cargo.toml

@@ -31,4 +31,4 @@ theme = { path = "../theme" }
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 urlencoding = "2.1.2"
 util = { path = "../util" }
-workspace = { path = "../workspace" }
+workspace = { path = "../workspace" }

crates/sqlez/Cargo.toml

@@ -15,4 +15,4 @@ thread_local = "1.1.4"
 lazy_static = "1.4"
 parking_lot = "0.11.1"
 futures = "0.3"
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid = { version = "1.1.2", features = ["v4"] }

crates/sqlez_macros/Cargo.toml

@@ -15,4 +15,4 @@ quote = "1.0"
 proc-macro2 = "1.0"
 lazy_static = "1.4"
 sqlez = { path = "../sqlez" }
-sqlformat = "0.2"
+sqlformat = "0.2"

crates/welcome/Cargo.toml

@@ -24,4 +24,4 @@ theme = { path = "../theme" }
 theme_selector = { path = "../theme_selector" }
 util = { path = "../util" }
 picker = { path = "../picker" }
-workspace = { path = "../workspace" }
+workspace = { path = "../workspace" }

crates/workspace/Cargo.toml

@@ -57,4 +57,4 @@ gpui = { path = "../gpui", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
 settings = { path = "../settings", features = ["test-support"] }
 fs = { path = "../fs", features = ["test-support"] }
-db = { path = "../db", features = ["test-support"] }
+db = { path = "../db", features = ["test-support"] }

crates/zed/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.77.0"
+version = "0.77.1"
 publish = false
 
 [lib]

crates/zed/RELEASE_CHANNEL

@@ -1 +1 @@
-dev
+preview

script/bundle

@@ -8,12 +8,12 @@ open_result=false
 
 # If -o option is specified, the folder of the resulting dmg will be opened in finder
 # If -d is specified, Zed will be compiled in debug mode and the application's path printed
-# If -od or -do is specified Zed will be bundled in debug and the application will be run. 
+# If -od or -do is specified Zed will be bundled in debug and the application will be run.
 while getopts 'od' flag
 do
     case "${flag}" in
         o) open_result=true;;
-        d) 
+        d)
             build_flag="";
             target_dir="debug"
             ;;
@@ -119,12 +119,16 @@ hdiutil create -volname Zed -srcfolder "${dmg_source_directory}" -ov -format UDZ
 # This symlink causes CPU issues with Zed if the Zed codebase is the project being worked on, so we simply remove it for now.
 rm ${dmg_source_directory}/Applications
 
+echo "Adding license agreement to DMG"
+npm install --global dmg-license minimist
+dmg-license script/terms/terms-of-use.json "${dmg_file_path}"
+
 if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then
     echo "Notarizing DMG with Apple"
     npm install -g notarize-cli
-    npx notarize-cli --file ${dmg_file_path} --bundle-id dev.zed.Zed --username "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD"
+    npx notarize-cli --file "${dmg_file_path}" --bundle-id dev.zed.Zed --username "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD"
 fi
 
 if [ "$open_result" = true ]; then
     open $dmg_target_directory
-fi
+fi

script/terms/terms-of-use.json

@@ -0,0 +1,9 @@
+{
+    "body": [
+        {
+            "lang": "en-US",
+            "type": "rtf",
+            "file": "terms-of-use.rtf"
+        }
+    ]
+}