SPDX license and workspace inheritence for re-used metadata (#833)

use workspace inheritence for license, edition and repo URL
This commit is contained in:
jake 2023-05-20 02:52:55 +01:00 committed by GitHub
parent 3880428596
commit 1aa8826398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 104 additions and 56 deletions

View file

@ -1,32 +1,37 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = [ members = [
"core", "core",
"crates/*", "crates/*",
# "crates/p2p/tunnel", # "crates/p2p/tunnel",
# "crates/p2p/tunnel/utils", # "crates/p2p/tunnel/utils",
"apps/cli", "apps/cli",
"apps/desktop/src-tauri", "apps/desktop/src-tauri",
"apps/desktop/crates/*", "apps/desktop/crates/*",
"apps/mobile/crates/*", "apps/mobile/crates/*",
"apps/server", "apps/server",
] ]
[workspace.package]
license = "AGPL-3.0-only"
edition = "2021"
repository = "https://github.com/spacedriveapp/spacedrive"
[workspace.dependencies] [workspace.dependencies]
prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [ prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [
"rspc", "rspc",
"sqlite-create-many", "sqlite-create-many",
"migrations", "migrations",
"sqlite", "sqlite",
] } ] }
prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [ prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [
"rspc", "rspc",
"sqlite-create-many", "sqlite-create-many",
"migrations", "migrations",
"sqlite", "sqlite",
] } ] }
prisma-client-rust-sdk = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [ prisma-client-rust-sdk = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "5d8029e0a0b590e1b8f674339ba880114a1becc8", features = [
"sqlite", "sqlite",
] } ] }
rspc = { version = "0.1.4" } rspc = { version = "0.1.4" }

View file

@ -1,7 +1,9 @@
[package] [package]
name = "cli" name = "cli"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1,7 +1,9 @@
[package] [package]
name = "sd-desktop-macos" name = "sd-desktop-macos"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -3,15 +3,22 @@ name = "spacedrive"
version = "0.1.0" version = "0.1.0"
description = "The universal file manager." description = "The universal file manager."
authors = ["Spacedrive Technology Inc."] authors = ["Spacedrive Technology Inc."]
license = ""
repository = "https://github.com/spacedriveapp/spacedrive"
default-run = "spacedrive" default-run = "spacedrive"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
tauri = { version = "1.3.0", features = ["api-all", "linux-protocol-headers", "macos-private-api"] } tauri = { version = "1.3.0", features = [
"api-all",
"linux-protocol-headers",
"macos-private-api",
] }
rspc = { workspace = true, features = ["tauri"] } rspc = { workspace = true, features = ["tauri"] }
httpz = { workspace = true, features = ["axum", "tauri"] } # TODO: The `axum` feature should be only enabled on Linux but this currently can't be done: https://github.com/rust-lang/cargo/issues/1197 httpz = { workspace = true, features = [
"axum",
"tauri",
] } # TODO: The `axum` feature should be only enabled on Linux but this currently can't be done: https://github.com/rust-lang/cargo/issues/1197
sd-core = { path = "../../../core", features = ["ffmpeg", "location-watcher"] } sd-core = { path = "../../../core", features = ["ffmpeg", "location-watcher"] }
tokio = { workspace = true, features = ["sync"] } tokio = { workspace = true, features = ["sync"] }
window-shadows = "0.2.0" window-shadows = "0.2.0"

View file

@ -1,8 +1,10 @@
[package] [package]
name = "sd-mobile-android" name = "sd-mobile-android"
version = "0.1.0" version = "0.1.0"
edition = "2021"
rust-version = "1.64.0" rust-version = "1.64.0"
license.workspace = true
repository.workspace = true
edition.workspace = true
[lib] [lib]
# Android can use dynamic linking since all FFI is done via JNI # Android can use dynamic linking since all FFI is done via JNI
@ -15,5 +17,5 @@ jni = "0.19.0"
# Core mobile handling stuff # Core mobile handling stuff
sd-mobile-core = { path = "../core" } sd-mobile-core = { path = "../core" }
# Other # Other
tracing = "0.1.37" tracing = "0.1.37"

View file

@ -1,22 +1,24 @@
[package] [package]
name = "sd-mobile-core" name = "sd-mobile-core"
version = "0.1.0" version = "0.1.0"
edition = "2021"
rust-version = "1.64.0" rust-version = "1.64.0"
license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
once_cell = "1.15.0" once_cell = "1.15.0"
sd-core = { path = "../../../../core", features = [ sd-core = { path = "../../../../core", features = [
"mobile", "mobile",
], default-features = false } ], default-features = false }
rspc.workspace = true rspc.workspace = true
serde_json = "1.0.85" serde_json = "1.0.85"
tokio = { workspace = true } tokio = { workspace = true }
openssl = { version = "0.10.42", features = [ openssl = { version = "0.10.42", features = [
"vendored", "vendored",
] } # Override features of transitive dependencies ] } # Override features of transitive dependencies
openssl-sys = { version = "0.9.76", features = [ openssl-sys = { version = "0.9.76", features = [
"vendored", "vendored",
] } # Override features of transitive dependencies to support IOS Simulator on M1 ] } # Override features of transitive dependencies to support IOS Simulator on M1
futures = "0.3.24" futures = "0.3.24"
tracing = "0.1.37" tracing = "0.1.37"

View file

@ -1,10 +1,12 @@
[package] [package]
name = "sd-mobile-ios" name = "sd-mobile-ios"
version = "0.1.0" version = "0.1.0"
edition = "2021"
rust-version = "1.64.0" rust-version = "1.64.0"
license.workspace = true
repository.workspace = true
edition.workspace = true
[lib] [lib]
# iOS requires static linking # iOS requires static linking
# Makes sense considering this lib needs to link against call_resolve and get_data_directory, # Makes sense considering this lib needs to link against call_resolve and get_data_directory,

View file

@ -1,7 +1,9 @@
[package] [package]
name = "server" name = "server"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
sd-core = { path = "../../core", features = ["ffmpeg"] } sd-core = { path = "../../core", features = ["ffmpeg"] }

View file

@ -3,10 +3,10 @@ name = "sd-core"
version = "0.1.0" version = "0.1.0"
description = "Virtual distributed filesystem engine that powers Spacedrive." description = "Virtual distributed filesystem engine that powers Spacedrive."
authors = ["Spacedrive Technology Inc."] authors = ["Spacedrive Technology Inc."]
license = "GNU GENERAL PUBLIC LICENSE"
repository = "https://github.com/spacedriveapp/spacedrive"
edition = "2021"
rust-version = "1.68.1" rust-version = "1.68.1"
license.workspace = true
repository.workspace = true
edition.workspace = true
[features] [features]
default = [] default = []

View file

@ -4,8 +4,10 @@ version = "0.0.0"
authors = ["Jake Robinson <jake@spacedrive.com>"] authors = ["Jake Robinson <jake@spacedrive.com>"]
readme = "README.md" readme = "README.md"
description = "A library to handle cryptographic functions within Spacedrive" description = "A library to handle cryptographic functions within Spacedrive"
edition = "2021"
rust-version = "1.67.0" rust-version = "1.67.0"
license.workspace = true
repository.workspace = true
edition.workspace = true
[features] [features]
rspc = ["dep:rspc", "dep:specta"] rspc = ["dep:rspc", "dep:specta"]
@ -65,6 +67,6 @@ security-framework = { version = "2.8.1", optional = true }
[dev-dependencies] [dev-dependencies]
tokio = { workspace = true, features = [ tokio = { workspace = true, features = [
"fs", "fs",
"macros", "macros",
] } # features needed for examples ] } # features needed for examples

View file

@ -1,9 +1,11 @@
[package] [package]
name = "deps-generator" name = "deps-generator"
version = "0.0.0" version = "0.0.0"
edition = "2021"
authors = ["Jake Robinson <jake@spacedrive.com>"] authors = ["Jake Robinson <jake@spacedrive.com>"]
description = "A tool to compile all Spacedrive dependencies and their respective licenses" description = "A tool to compile all Spacedrive dependencies and their respective licenses"
license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
reqwest = { version = "0.11.14", features = ["blocking"] } reqwest = { version = "0.11.14", features = ["blocking"] }

View file

@ -2,12 +2,12 @@
name = "sd-ffmpeg" name = "sd-ffmpeg"
version = "0.1.0" version = "0.1.0"
authors = ["Ericson Soares <ericson.ds999@gmail.com>"] authors = ["Ericson Soares <ericson.ds999@gmail.com>"]
edition = "2021"
readme = "README.md" readme = "README.md"
description = "A simple library to generate video thumbnails using ffmpeg with the webp format" description = "A simple library to generate video thumbnails using ffmpeg with the webp format"
license = "MIT"
rust-version = "1.64.0" rust-version = "1.64.0"
resolver = "2" license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1,11 +1,13 @@
[package] [package]
name = "sd-file-ext" name = "sd-file-ext"
version = "0.0.0" version = "0.0.0"
edition = "2021"
authors = [ authors = [
"Brendan Allen <brendan@spacedrive.com>", "Brendan Allen <brendan@spacedrive.com>",
"Jamie Pine <jamie@spacedrive.com>", "Jamie Pine <jamie@spacedrive.com>",
] ]
license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]

View file

@ -1,7 +1,9 @@
[package] [package]
name = "sd-macos" name = "sd-macos"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -3,7 +3,9 @@ name = "sd-p2p"
version = "0.1.0" version = "0.1.0"
description = "Rust Peer to Peer Networking Library" description = "Rust Peer to Peer Networking Library"
authors = ["Oscar Beaumont <oscar@otbeaumont.me>"] authors = ["Oscar Beaumont <oscar@otbeaumont.me>"]
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
[features] [features]
default = [] default = []
@ -11,7 +13,13 @@ serde = []
specta = [] specta = []
[dependencies] [dependencies]
tokio = { workspace = true, features = ["macros", "sync", "time", "io-util", "fs"] } tokio = { workspace = true, features = [
"macros",
"sync",
"time",
"io-util",
"fs",
] }
libp2p = { version = "0.51.0", features = ["tokio", "quic", "serde"] } libp2p = { version = "0.51.0", features = ["tokio", "quic", "serde"] }
mdns-sd = "0.6.1" mdns-sd = "0.6.1"
thiserror = "1.0.39" thiserror = "1.0.39"

View file

@ -1,7 +1,9 @@
[package] [package]
name = "prisma-cli" name = "prisma-cli"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
prisma-client-rust-cli = { workspace = true } prisma-client-rust-cli = { workspace = true }

View file

@ -1,7 +1,9 @@
[package] [package]
name = "sd-sync-generator" name = "sd-sync-generator"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -1,7 +1,9 @@
[package] [package]
name = "sd-sync" name = "sd-sync"
version = "0.1.0" version = "0.1.0"
edition = "2021" license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
rand = "0.8.5" rand = "0.8.5"

View file

@ -1,9 +1,11 @@
[package] [package]
name = "sd-sync-example" name = "sd-sync-example"
version = "0.1.0" version = "0.1.0"
edition = "2021"
rust-version = "1.64" rust-version = "1.64"
publish = false publish = false
license.workspace = true
repository.workspace = true
edition.workspace = true
[dependencies] [dependencies]
serde_json = "1.0.85" serde_json = "1.0.85"