fixup! chore: Define our license in the workspace and use it in every…

… crate we have
matrix-org · Oct 4, 2024 · 39b617a · 39b617a
1 parent 662414c
commit 39b617a
Show file tree

Hide file tree

Showing 34 changed files with 33 additions and 34 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ resolver = "2"
 
 [workspace.package]
 rust-version = "1.76"
-license = "Apache-2.0"
 
 [workspace.dependencies]
 anyhow = "1.0.68"

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -2,7 +2,7 @@
 name = "benchmarks"
 description = "Matrix SDK benchmarks"
 edition = "2021"
-license = { workspace = true }
+license = "Apache-2.0"
 rust-version = { workspace = true }
 version = "1.0.0"
 publish = false

diff --git a/bindings/matrix-sdk-crypto-ffi/Cargo.toml b/bindings/matrix-sdk-crypto-ffi/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 rust-version = { workspace = true }
 description = "Uniffi based bindings for the Rust SDK crypto crate"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
-license = { workspace = true }
+license = "Apache-2.0"
 publish = false
 
 [lib]

diff --git a/bindings/matrix-sdk-ffi/Cargo.toml b/bindings/matrix-sdk-ffi/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.0"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ffi"]
-license = { workspace = true }
+license = "Apache-2.0"
 readme = "README.md"
 rust-version = { workspace = true }
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml
@@ -4,7 +4,7 @@ description = "The base component to build a Matrix client library."
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk-base"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/crates/matrix-sdk-common/Cargo.toml b/crates/matrix-sdk-common/Cargo.toml
@@ -4,7 +4,7 @@ description = "Collection of common types and imports used in the matrix-sdk"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk-common"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml
@@ -4,7 +4,7 @@ description = "Matrix encryption library"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk-crypto"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml
@@ -3,7 +3,7 @@ name = "matrix-sdk-indexeddb"
 version = "0.7.0"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
 description = "Web's IndexedDB Storage backend for matrix-sdk"
-license = { workspace = true }
+license = "Apache-2.0"
 edition = "2021"
 rust-version = { workspace = true }
 readme = "README.md"

diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Damir Jelić <poljar@termina.org.uk>"]
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
-license = { workspace = true }
+license = "Apache-2.0"
 readme = "README.md"
 rust-version = { workspace = true }
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/crates/matrix-sdk-sqlite/Cargo.toml b/crates/matrix-sdk-sqlite/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.7.1"
 edition = "2021"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
 description = "Sqlite storage backend for matrix-sdk"
-license = { workspace = true }
+license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [features]

diff --git a/crates/matrix-sdk-store-encryption/Cargo.toml b/crates/matrix-sdk-store-encryption/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.7.0"
 edition = "2021"
 description = "Helpers for encrypted storage keys for the Matrix SDK"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
-license = { workspace = true }
+license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [package.metadata.docs.rs]

diff --git a/crates/matrix-sdk-ui/Cargo.toml b/crates/matrix-sdk-ui/Cargo.toml
@@ -4,7 +4,7 @@ description = "GUI-centric utilities on top of matrix-rust-sdk (experimental)."
 version = "0.7.0"
 edition = "2021"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"
-license = { workspace = true }
+license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [features]

diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
@@ -4,7 +4,7 @@ description = "A high level Matrix client-server library."
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/examples/autojoin/Cargo.toml b/examples/autojoin/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-autojoin"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-autojoin"

diff --git a/examples/backups/Cargo.toml b/examples/backups/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-backups"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-backups"

diff --git a/examples/command_bot/Cargo.toml b/examples/command_bot/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-command-bot"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-command-bot"

diff --git a/examples/cross_signing_bootstrap/Cargo.toml b/examples/cross_signing_bootstrap/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-cross-signing-bootstrap"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-cross-signing-bootstrap"

diff --git a/examples/custom_events/Cargo.toml b/examples/custom_events/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-custom-events"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-custom-events"

diff --git a/examples/emoji_verification/Cargo.toml b/examples/emoji_verification/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-emoji-verification"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-emoji-verification"

diff --git a/examples/get_profiles/Cargo.toml b/examples/get_profiles/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-get-profiles"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-get-profiles"

diff --git a/examples/getting_started/Cargo.toml b/examples/getting_started/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-getting-started"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-getting-started"

diff --git a/examples/image_bot/Cargo.toml b/examples/image_bot/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-image-bot"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-image-bot"

diff --git a/examples/login/Cargo.toml b/examples/login/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-login"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-login"

diff --git a/examples/oidc_cli/Cargo.toml b/examples/oidc_cli/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-oidc-cli"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-oidc-cli"

diff --git a/examples/persist_session/Cargo.toml b/examples/persist_session/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-persist-session"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-persist-session"

diff --git a/examples/qr-login/Cargo.toml b/examples/qr-login/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-qr-login"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-qr-login"

diff --git a/examples/secret_storage/Cargo.toml b/examples/secret_storage/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-secret-storage"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-secret-storage"

diff --git a/examples/timeline/Cargo.toml b/examples/timeline/Cargo.toml
@@ -3,7 +3,7 @@ name = "example-timeline"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "example-timeline"

diff --git a/labs/multiverse/Cargo.toml b/labs/multiverse/Cargo.toml
@@ -3,7 +3,7 @@ name = "multiverse"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "multiverse"

diff --git a/testing/matrix-sdk-integration-testing/Cargo.toml b/testing/matrix-sdk-integration-testing/Cargo.toml
@@ -4,7 +4,7 @@ description = "Internal integration testing for matrix-sdk crate"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [dev-dependencies]
 anyhow = { workspace = true }

diff --git a/testing/matrix-sdk-test-macros/Cargo.toml b/testing/matrix-sdk-test-macros/Cargo.toml
@@ -4,7 +4,7 @@ description = "Helper macros to write tests for the Matrix SDK"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk-test-macros"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/testing/matrix-sdk-test/Cargo.toml b/testing/matrix-sdk-test/Cargo.toml
@@ -4,7 +4,7 @@ description = "Helpers to write tests for the Matrix SDK"
 edition = "2021"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma"]
-license = { workspace = true }
+license = "Apache-2.0"
 name = "matrix-sdk-test"
 readme = "README.md"
 repository = "https://github.com/matrix-org/matrix-rust-sdk"

diff --git a/uniffi-bindgen/Cargo.toml b/uniffi-bindgen/Cargo.toml
@@ -3,7 +3,7 @@ name = "uniffi-bindgen"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [dependencies]
 uniffi = { workspace = true, features = ["cli"] }
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -3,7 +3,7 @@ name = "xtask"
 version = "0.1.0"
 edition = "2021"
 publish = false
-license = { workspace = true }
+license = "Apache-2.0"
 
 [[bin]]
 name = "xtask"