Skip to content

Commit

Permalink
Merge branch 'main' into contract-help
Browse files Browse the repository at this point in the history
  • Loading branch information
fnando authored Jan 29, 2025
2 parents 22b467d + cb33c96 commit 976ebfa
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 160 deletions.
84 changes: 2 additions & 82 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:**

Expand Down Expand Up @@ -2486,15 +2485,3 @@ Print version information



## `stellar licenses`

Show dependency licenses

**Usage:** `stellar licenses [OPTIONS]`

###### **Options:**

* `-v`, `--verbose` — Display the license text



2 changes: 0 additions & 2 deletions cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 0 additions & 7 deletions cmd/soroban-cli/build.rs
Original file line number Diff line number Diff line change
@@ -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");
}
48 changes: 0 additions & 48 deletions cmd/soroban-cli/src/commands/licenses.rs

This file was deleted.

5 changes: 0 additions & 5 deletions cmd/soroban-cli/src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()?,
Expand Down Expand Up @@ -186,9 +184,6 @@ pub enum Cmd {

/// Print version information
Version(version::Cmd),

/// Show dependency licenses
Licenses(licenses::Cmd),
}

#[derive(thiserror::Error, Debug)]
Expand Down
3 changes: 0 additions & 3 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 976ebfa

Please sign in to comment.