diff --git a/.gitmodules b/.gitmodules index 042008edd..e514a7f6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,6 +46,3 @@ [submodule "termux-elf-cleaner"] path = tools/termux-elf-cleaner url = https://github.com/termux/termux-elf-cleaner.git -[submodule "argh"] - path = native/src/external/argh - url = https://github.com/topjohnwu/argh.git diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock index dc4d5f1cd..9105dbd40 100644 --- a/native/src/Cargo.lock +++ b/native/src/Cargo.lock @@ -23,6 +23,7 @@ dependencies = [ [[package]] name = "argh" version = "0.1.10" +source = "git+https://github.com/topjohnwu/argh.git?rev=2fecd81d606364a8b07b942ed01697bbd3a62193#2fecd81d606364a8b07b942ed01697bbd3a62193" dependencies = [ "argh_derive", "argh_shared", @@ -31,6 +32,7 @@ dependencies = [ [[package]] name = "argh_derive" version = "0.1.10" +source = "git+https://github.com/topjohnwu/argh.git?rev=2fecd81d606364a8b07b942ed01697bbd3a62193#2fecd81d606364a8b07b942ed01697bbd3a62193" dependencies = [ "argh_shared", "proc-macro2", @@ -41,6 +43,7 @@ dependencies = [ [[package]] name = "argh_shared" version = "0.1.10" +source = "git+https://github.com/topjohnwu/argh.git?rev=2fecd81d606364a8b07b942ed01697bbd3a62193#2fecd81d606364a8b07b942ed01697bbd3a62193" [[package]] name = "atty" diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml index ae64d5790..c6c37c56a 100644 --- a/native/src/Cargo.toml +++ b/native/src/Cargo.toml @@ -6,7 +6,6 @@ resolver = "2" [workspace.dependencies] cxx = { path = "external/cxx-rs" } cxx-gen = { path = "external/cxx-rs/gen/lib" } -argh = { path = "external/argh/argh" } libc = "0.2" cfg-if = "1.0" num-traits = "0.2" @@ -18,6 +17,10 @@ sha1 = "0.10" sha2 = "0.10" digest = "0.10" +[workspace.dependencies.argh] +git = "https://github.com/topjohnwu/argh.git" +rev = "2fecd81d606364a8b07b942ed01697bbd3a62193" + [workspace.dependencies.pb-rs] git = "https://github.com/tafia/quick-protobuf.git" rev = "2f37d5a65504de7d716b5b28fd82219501a901a9" diff --git a/native/src/external/argh b/native/src/external/argh deleted file mode 160000 index 2fecd81d6..000000000 --- a/native/src/external/argh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2fecd81d606364a8b07b942ed01697bbd3a62193