diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 7287238..8812eb0 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -53,7 +53,7 @@ jobs: - name: Build & Test - ezlog All Features run: cargo test --manifest-path ./ezlog-core/Cargo.toml --verbose --all-features --no-fail-fast - name: Build & Test - ezlog_cli - run: cargo test --manifest-path ./ezlog-cli/Cargo.toml --verbose --no-default-features --no-fail-fast + run: cargo test --manifest-path ./ezlogcli/Cargo.toml --verbose --no-default-features --no-fail-fast - name: Install Android NDK if: ${{ runner.os == 'Linux' }} uses: nttld/setup-ndk@v1.2.0 diff --git a/.github/workflows/publish_rust.yml b/.github/workflows/publish_rust.yml index 6fc2b07..a63ee83 100644 --- a/.github/workflows/publish_rust.yml +++ b/.github/workflows/publish_rust.yml @@ -25,5 +25,5 @@ jobs: components: rustfmt, clippy - name: Publish ezlog on crates.io run: cargo +nightly publish --package ezlog --token ${CRATES_TOKEN} - - name: Publish ezlog-cli on crates.io - run: cargo +nightly publish --package ezlog-cli --token ${CRATES_TOKEN} + - name: Publish ezlogcli on crates.io + run: cargo +nightly publish --package ezlogcli --token ${CRATES_TOKEN} diff --git a/Cargo.toml b/Cargo.toml index d069dba..4410cb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [workspace] -members = ["ezlog-cli", "ezlog-core", "examples/android_preview", "examples/nest_log"] +members = ["ezlogcli", "ezlog-core", "examples/android_preview", "examples/nest_log"] # https://github.com/johnthagen/min-sized-rust [profile.release] diff --git a/README.md b/README.md index e8997ca..c6f6606 100644 --- a/README.md +++ b/README.md @@ -253,7 +253,7 @@ see more examples in examples dir. │   └── lib-ezlog # ezlog android library ├── examples # Rust examples ├── ezlog_flutter # Flutter plugin -├── ezlog-cli # Rust command line tool +├── ezlogcli # Rust command line tool ├── ezlog-core # Rust core library ├── ios │   ├── EZLog # ezlog iOS library diff --git a/docs/JOURNAL.md b/docs/JOURNAL.md index 930235e..8b11564 100644 --- a/docs/JOURNAL.md +++ b/docs/JOURNAL.md @@ -91,7 +91,7 @@ Starting: Intent { act=android.intent.action.MAIN cmp=rust.ezlog_android_preview │   ├── app # android 示例工程 │   └── lib-ezlog # EZLog android 库 ├── examples # rust 示例 -├── ezlog-cli # 命令行工具 +├── ezlogcli # 命令行工具 ├── ezlog-core # 核心库 ├── ios │   ├── EZLog # EZLog iOS 库 diff --git a/docs/po/messages.pot b/docs/po/messages.pot index 4f2a561..4a665f0 100644 --- a/docs/po/messages.pot +++ b/docs/po/messages.pot @@ -463,7 +463,7 @@ msgid "" "│   └── lib-ezlog # ezlog android library\n" "├── examples # Rust examples\n" "├── ezlog_flutter # Flutter plugin\n" -"├── ezlog-cli # Rust command line tool\n" +"├── ezlogcli # Rust command line tool\n" "├── ezlog-core # Rust core library\n" "├── ios\n" "│   ├── EZLog # ezlog iOS library\n" diff --git a/docs/po/zh.po b/docs/po/zh.po index e5acfaf..89e912d 100644 --- a/docs/po/zh.po +++ b/docs/po/zh.po @@ -482,7 +482,7 @@ msgid "" "│   └── lib-ezlog # ezlog android library\n" "├── examples # Rust examples\n" "├── ezlog_flutter # Flutter plugin\n" -"├── ezlog-cli # Rust command line tool\n" +"├── ezlogcli # Rust command line tool\n" "├── ezlog-core # Rust core library\n" "├── ios\n" "│   ├── EZLog # ezlog iOS library\n" diff --git a/docs/src/architecture.md b/docs/src/architecture.md index d01d69d..640e353 100644 --- a/docs/src/architecture.md +++ b/docs/src/architecture.md @@ -8,7 +8,7 @@ │   └── lib-ezlog # ezlog android library ├── examples # Rust examples ├── ezlog_flutter # Flutter plugin -├── ezlog-cli # Rust command line tool +├── ezlogcli # Rust command line tool ├── ezlog-core # Rust core library ├── ios │   ├── EZLog # ezlog iOS library diff --git a/ezlog-cli/Cargo.toml b/ezlogcli/Cargo.toml similarity index 96% rename from ezlog-cli/Cargo.toml rename to ezlogcli/Cargo.toml index 00690f3..35ad1ae 100644 --- a/ezlog-cli/Cargo.toml +++ b/ezlogcli/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ezlog-cli" +name = "ezlogcli" version = "0.2.0-beta.4" edition = "2021" description = "EZLog command line tool" diff --git a/ezlog-cli/README.md b/ezlogcli/README.md similarity index 95% rename from ezlog-cli/README.md rename to ezlogcli/README.md index f5890b0..076dba7 100644 --- a/ezlog-cli/README.md +++ b/ezlogcli/README.md @@ -1,7 +1,7 @@ # EZLog command line tool ``` -Usage: ezlog-cli [OPTIONS] +Usage: ezlogcli [OPTIONS] Options: -i, --input diff --git a/ezlog-cli/resources/test/test.mmap b/ezlogcli/resources/test/test.mmap similarity index 100% rename from ezlog-cli/resources/test/test.mmap rename to ezlogcli/resources/test/test.mmap diff --git a/ezlog-cli/src/main.rs b/ezlogcli/src/main.rs similarity index 98% rename from ezlog-cli/src/main.rs rename to ezlogcli/src/main.rs index d004a55..8a960ea 100644 --- a/ezlog-cli/src/main.rs +++ b/ezlogcli/src/main.rs @@ -159,7 +159,7 @@ mod tests { #[test] fn test_help() { escargot::CargoBuild::new() - .bin("ezlog-cli") + .bin("ezlogcli") .current_release() .current_target() .run() @@ -172,7 +172,7 @@ mod tests { #[test] fn test_decode() { let bin_under_test = escargot::CargoBuild::new() - .bin("ezlog-cli") + .bin("ezlogcli") .current_release() .current_target() .run() diff --git a/rust-toolchain b/rust-toolchain index 90f377a..c34ab85 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-03-07 \ No newline at end of file +nightly-2023-10-13 \ No newline at end of file