diff --git a/Cargo.lock b/Cargo.lock index 60de7f23..1e7b59a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,6 +116,15 @@ dependencies = [ "log", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anyhow" version = "1.0.52" @@ -677,9 +686,13 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ + "ansi_term", + "atty", "bitflags", + "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", + "vec_map", ] [[package]] @@ -692,7 +705,7 @@ dependencies = [ "bitflags", "indexmap", "os_str_bytes", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap 0.14.2", ] @@ -1114,7 +1127,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn", ] @@ -1838,8 +1851,8 @@ dependencies = [ "android_logger", "backtrace", "byteorder", - "cfg-if 1.0.0", - "clap 3.0.7", + "cfg-if 0.1.10", + "clap 2.34.0", "core-foundation 0.9.2", "core-foundation-sys 0.8.3", "directories", @@ -1850,6 +1863,7 @@ dependencies = [ "log", "ndk", "ndk-glue", + "owning_ref", "rpassword", "secret-service", "security-framework", @@ -3432,6 +3446,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.10.0" @@ -3770,6 +3790,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "veilid-cli" version = "0.1.0" diff --git a/external/keyring-manager b/external/keyring-manager index 1295d708..3713e105 160000 --- a/external/keyring-manager +++ b/external/keyring-manager @@ -1 +1 @@ -Subproject commit 1295d708ec42542f076a13db69eadc448a94f985 +Subproject commit 3713e10599c6078e058aab785ef46594420dc11b diff --git a/setup_android.sh b/setup_android.sh index d0cfd1c1..3d89d18c 100755 --- a/setup_android.sh +++ b/setup_android.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -if [ ! "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then +if [ ! "$(grep -qEi 'debian|buntu|mint' /etc/*release 2>/dev/null)" ]; then echo Not a supported Linux exit 1 fi diff --git a/setup_flutter.bat b/setup_flutter.bat index bb0f7d9f..401acdbd 100644 --- a/setup_flutter.bat +++ b/setup_flutter.bat @@ -51,6 +51,10 @@ rem ensure packages are installed winget install -e --id LLVM.LLVM --accept-package-agreements --accept-source-agreements rem ensure windows is enabled in flutter -flutter config --enable-windows-desktop --no-enable-android +call flutter config --enable-windows-desktop --no-enable-android -flutter doctor -v \ No newline at end of file +rem turn off analytics +call flutter config --no-analytics +call dart --disable-analytics + +call flutter doctor -v \ No newline at end of file diff --git a/setup_flutter.sh b/setup_flutter.sh index 2ec7a94f..5badc1a8 100755 --- a/setup_flutter.sh +++ b/setup_flutter.sh @@ -60,10 +60,15 @@ if [ "$OS" == "linux" ]; then elif [ "$OS" == "macos" ]; then # ensure packages are installed brew install llvm - + sudo gem install cocoapods + # ensure platforms are enabled in flutter flutter config --enable-macos-desktop --enable-ios --no-enable-android fi +# turn off analytics +flutter config --no-analytics +dart --disable-analytics + # run flutter doctor flutter doctor -v