Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Relicense zlog, ztracing, and ztracing_macro under Apache-2.0 (#63573)

Mikayla Makiac5af8b9e1ea
diff --git a/crates/gpui_shared_string/Cargo.toml b/crates/gpui_shared_string/Cargo.toml
index e1e975a5501..36ce41ac7f2 100644
--- a/crates/gpui_shared_string/Cargo.toml
+++ b/crates/gpui_shared_string/Cargo.toml
@@ -3,6 +3,7 @@ name = "gpui_shared_string"
version = "0.1.0"
publish.workspace = true
edition.workspace = true
+license = "Apache-2.0"
[lib]
path = "gpui_shared_string.rs"
diff --git a/crates/gpui_util/Cargo.toml b/crates/gpui_util/Cargo.toml
index cad692b04dc..06810be2065 100644
--- a/crates/gpui_util/Cargo.toml
+++ b/crates/gpui_util/Cargo.toml
@@ -3,6 +3,7 @@ name = "gpui_util"
version = "0.1.0"
publish.workspace = true
edition.workspace = true
+license = "Apache-2.0"
[dependencies]
log.workspace = true
diff --git a/crates/zlog/Cargo.toml b/crates/zlog/Cargo.toml
index 2799592c8eb..46f2cff3241 100644
--- a/crates/zlog/Cargo.toml
+++ b/crates/zlog/Cargo.toml
@@ -3,7 +3,7 @@ name = "zlog"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
-license = "GPL-3.0-or-later"
+license = "Apache-2.0"
[lints]
workspace = true
diff --git a/crates/zlog/LICENSE-APACHE b/crates/zlog/LICENSE-APACHE
new file mode 120000
index 00000000000..1cd601d0a3a
--- /dev/null
+++ b/crates/zlog/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/zlog/LICENSE-GPL b/crates/zlog/LICENSE-GPL
deleted file mode 120000
index 89e542f750c..00000000000
--- a/crates/zlog/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ztracing/Cargo.toml b/crates/ztracing/Cargo.toml
index 81d3fc0d09f..e823785acd5 100644
--- a/crates/ztracing/Cargo.toml
+++ b/crates/ztracing/Cargo.toml
@@ -3,7 +3,7 @@ name = "ztracing"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
-license = "GPL-3.0-or-later"
+license = "Apache-2.0"
[lints]
workspace = true
diff --git a/crates/ztracing/LICENSE-GPL b/crates/ztracing/LICENSE-GPL
deleted file mode 120000
index 89e542f750c..00000000000
--- a/crates/ztracing/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ztracing_macro/Cargo.toml b/crates/ztracing_macro/Cargo.toml
index dbd7adce5fc..5420bc6063c 100644
--- a/crates/ztracing_macro/Cargo.toml
+++ b/crates/ztracing_macro/Cargo.toml
@@ -3,7 +3,7 @@ name = "ztracing_macro"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
-license = "GPL-3.0-or-later"
+license = "Apache-2.0"
[lib]
proc-macro = true
diff --git a/crates/ztracing_macro/LICENSE-GPL b/crates/ztracing_macro/LICENSE-GPL
deleted file mode 120000
index 89e542f750c..00000000000
--- a/crates/ztracing_macro/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file