diff --git a/Cargo.lock b/Cargo.lock index cb84268b2..6662bdc8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "ahash" version = "0.8.11" @@ -541,7 +535,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -602,25 +596,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" -dependencies = [ - "bincode_derive", - "serde", -] - -[[package]] -name = "bincode_derive" -version = "2.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" -dependencies = [ - "virtue", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1625,7 +1600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -2898,23 +2873,6 @@ dependencies = [ "libc", ] -[[package]] -name = "license-fetcher" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904bd80dd046aa1c625ddfd81c88a85a54ff3ca0ddcce0ca1ad9c8d7b6db185d" -dependencies = [ - "bincode", - "directories", - "log", - "miniz_oxide 0.8.3", - "once_cell", - "regex", - "serde", - "serde_json", - "simplelog", -] - [[package]] name = "link-cplusplus" version = "1.0.9" @@ -3012,15 +2970,6 @@ dependencies = [ "adler", ] -[[package]] -name = "miniz_oxide" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "1.0.1" @@ -3195,15 +3144,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -4488,17 +4428,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" -[[package]] -name = "simplelog" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" -dependencies = [ - "log", - "termcolor", - "time", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -4620,7 +4549,6 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", "keyring", - "license-fetcher", "mockito", "num-bigint", "open", @@ -5464,9 +5392,7 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -5891,12 +5817,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "virtue" -version = "0.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" - [[package]] name = "wait-timeout" version = "0.2.0" diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md index 3ba398c03..0aa449ca8 100644 --- a/FULL_HELP_DOCS.md +++ b/FULL_HELP_DOCS.md @@ -55,7 +55,6 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c * `completion` — Print shell completion code for the specified shell * `cache` — Cache for transactions and contract specs * `version` — Print version information -* `licenses` — Show dependency licenses ###### **Options:** @@ -2486,15 +2485,3 @@ Print version information -## `stellar licenses` - -Show dependency licenses - -**Usage:** `stellar licenses [OPTIONS]` - -###### **Options:** - -* `-v`, `--verbose` — Display the license text - - - diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml index 01ad5471e..2b667b0b1 100644 --- a/cmd/soroban-cli/Cargo.toml +++ b/cmd/soroban-cli/Cargo.toml @@ -129,12 +129,10 @@ zeroize = "1.8.1" keyring = { version = "3", features = ["apple-native", "windows-native", "sync-secret-service"] } whoami = "1.5.2" serde_with = "3.11.0" -license-fetcher = "0.5.0" [build-dependencies] crate-git-revision = "0.0.6" -license-fetcher = { version = "0.5.0", features = ["build"] } serde.workspace = true thiserror.workspace = true diff --git a/cmd/soroban-cli/build.rs b/cmd/soroban-cli/build.rs index bcd2f3636..b6e6dd92a 100644 --- a/cmd/soroban-cli/build.rs +++ b/cmd/soroban-cli/build.rs @@ -1,10 +1,3 @@ -use license_fetcher::build_script::generate_package_list_with_licenses; - fn main() { crate_git_revision::init(); - - generate_package_list_with_licenses().write(); - println!("cargo::rerun-if-changed=build.rs"); - println!("cargo::rerun-if-changed=Cargo.lock"); - println!("cargo::rerun-if-changed=Cargo.toml"); } diff --git a/cmd/soroban-cli/src/commands/licenses.rs b/cmd/soroban-cli/src/commands/licenses.rs deleted file mode 100644 index 8e60073af..000000000 --- a/cmd/soroban-cli/src/commands/licenses.rs +++ /dev/null @@ -1,48 +0,0 @@ -use clap::Parser; -use std::fmt::Debug; - -use license_fetcher::get_package_list_macro; - -#[derive(Parser, Debug, Clone)] -#[group(skip)] -pub struct Cmd { - /// Display the license text. - #[arg(long, short)] - pub verbose: bool, -} - -impl Cmd { - #[allow(clippy::unused_self)] - pub fn run(&self) { - let package_list = get_package_list_macro!(); - - package_list.iter().for_each(|pkg| { - println!( - "Name: {name}\nVersion: {version}\nLicense: {license}", - name = pkg.name, - version = pkg.version, - license = pkg - .license_identifier - .clone() - .unwrap_or("Unknown".to_string()), - ); - - if let Some(repo) = pkg.repository.clone() { - println!("Repo: {repo}"); - } - - if let Some(url) = pkg.homepage.clone() { - println!("URL: {url}"); - } - - if self.verbose { - if let Some(text) = pkg.license_text.clone() { - println!("{text}"); - println!("———"); - } - } - - println!(); - }); - } -} diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs index 7d86fc003..a12347126 100644 --- a/cmd/soroban-cli/src/commands/mod.rs +++ b/cmd/soroban-cli/src/commands/mod.rs @@ -13,7 +13,6 @@ pub mod env; pub mod events; pub mod global; pub mod keys; -pub mod licenses; pub mod network; pub mod plugin; pub mod snapshot; @@ -118,7 +117,6 @@ impl Root { Cmd::Container(container) => container.run(&self.global_args).await?, Cmd::Snapshot(snapshot) => snapshot.run(&self.global_args).await?, Cmd::Version(version) => version.run(), - Cmd::Licenses(licenses) => licenses.run(), Cmd::Keys(id) => id.run(&self.global_args).await?, Cmd::Tx(tx) => tx.run(&self.global_args).await?, Cmd::Cache(cache) => cache.run()?, @@ -186,9 +184,6 @@ pub enum Cmd { /// Print version information Version(version::Cmd), - - /// Show dependency licenses - Licenses(licenses::Cmd), } #[derive(thiserror::Error, Debug)] diff --git a/deny.toml b/deny.toml index 1d0738c60..196109849 100644 --- a/deny.toml +++ b/deny.toml @@ -112,7 +112,6 @@ allow = [ "BSD-2-Clause", "CC0-1.0", "Unicode-3.0", - "BSL-1.0", ] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses @@ -314,8 +313,6 @@ skip = [ { crate = "bitflags", reason = "too many", version = "=1.3.2" }, { crate = "socket2", reason = "too many", version = "=0.4.10" }, - - { crate = "miniz_oxide", reason = "too many", version = "=0.7.4" }, ] # Similarly to `skip` allows you to skip certain crates during duplicate # detection. Unlike skip, it also includes the entire tree of transitive