From afd34ad82b7b68a3fea774b647b37dec153e8e11 Mon Sep 17 00:00:00 2001 From: zephyr Date: Mon, 18 Dec 2023 01:02:32 +0900 Subject: [PATCH] bump version --- .github/workflows/build.yml | 118 +++++-------- .github/workflows/release.yml | 120 +++++-------- Cargo.lock | 311 ++++------------------------------ Cargo.toml | 1 + cmd/Cargo.toml | 4 +- 5 files changed, 120 insertions(+), 434 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be091e7..069afbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,10 @@ name: build on: push: + paths-ignore: ["**.md"] branches: [ master ] pull_request: + paths-ignore: ["**.md"] branches: [ master ] jobs: @@ -10,109 +12,69 @@ jobs: strategy: fail-fast: false matrix: + os: [ubuntu-20.04] + cross: [true] include: - target: x86_64-unknown-linux-gnu - os: ubuntu-20.04 - cross: false - file-ext: "" - target: x86_64-unknown-linux-musl - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: x86_64-pc-windows-msvc - os: windows-latest - cross: false - file-ext: .exe - target: x86_64-pc-windows-gnu - os: ubuntu-20.04 - cross: true - file-ext: .exe - - target: x86_64-apple-darwin - os: macos-latest - cross: false - file-ext: "" - target: x86_64-linux-android - os: ubuntu-20.04 - cross: true - file-ext: "" - target: aarch64-unknown-linux-gnu - os: ubuntu-20.04 - cross: true - file-ext: "" - target: aarch64-unknown-linux-musl - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: aarch64-apple-darwin - os: macos-latest - cross: true - file-ext: "" - target: aarch64-linux-android - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: aarch64-apple-ios - os: macos-latest - cross: true - file-ext: "" - target: armv7-unknown-linux-gnueabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-gnueabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-musleabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-musleabihf - os: ubuntu-20.04 - cross: true - file-ext: "" + - target: armv7-linux-androideabi - target: arm-unknown-linux-gnueabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-gnueabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-musleabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-musleabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-linux-androideabi - os: ubuntu-20.04 - cross: true - file-ext: "" + - target: x86_64-pc-windows-msvc + os: windows-latest + cross: false + - target: x86_64-apple-darwin + os: macos-latest + cross: false + - target: aarch64-apple-darwin + os: macos-latest + cross: false + - target: aarch64-apple-ios + os: macos-latest + cross: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: ${{ matrix.target }} - override: true - - name: build - uses: actions-rs/cargo@v1 + uses: dtolnay/rust-toolchain@master with: - use-cross: ${{ matrix.cross }} - command: build - args: --release -p kaminari-cmd --target=${{ matrix.target }} - - name: pack + toolchain: nightly + targets: ${{ matrix.target }} + - name: install cross + if: ${{ matrix.cross }} + run: cargo install cross --git https://github.com/cross-rs/cross + - name: build cross + if: ${{ matrix.cross }} + run: cross build --release -p kaminari-cmd --target=${{ matrix.target }} + - name: build native + if: ${{ !matrix.cross }} + run: cargo build --release -p kaminari-cmd --target=${{ matrix.target }} + - name: pack unix + if: "!contains(matrix.target, 'windows')" + run: | + mkdir -p build-${{ matrix.target }} + cd build-${{ matrix.target }} + tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris kaminaric + - name: pack windows + if: "contains(matrix.target, 'windows')" run: | mkdir -p build-${{ matrix.target }} cd build-${{ matrix.target }} - tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris${{ matrix.file-ext }} kaminaric${{ matrix.file-ext }} + tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris.exe kaminaric.exe - name: upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: kaminari-${{ matrix.target }}.tar.gz path: build-${{ matrix.target }}/kaminari-${{ matrix.target }}.tar.gz diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 401fb78..d331d38 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,109 +9,69 @@ jobs: strategy: fail-fast: false matrix: + os: [ubuntu-20.04] + cross: [true] include: - target: x86_64-unknown-linux-gnu - os: ubuntu-20.04 - cross: false - file-ext: "" - target: x86_64-unknown-linux-musl - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: x86_64-pc-windows-msvc - os: windows-latest - cross: false - file-ext: .exe - target: x86_64-pc-windows-gnu - os: ubuntu-20.04 - cross: true - file-ext: .exe - - target: x86_64-apple-darwin - os: macos-latest - cross: false - file-ext: "" - target: x86_64-linux-android - os: ubuntu-20.04 - cross: true - file-ext: "" - target: aarch64-unknown-linux-gnu - os: ubuntu-20.04 - cross: true - file-ext: "" - target: aarch64-unknown-linux-musl - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: aarch64-apple-darwin - os: macos-latest - cross: true - file-ext: "" - target: aarch64-linux-android - os: ubuntu-20.04 - cross: true - file-ext: "" - - target: aarch64-apple-ios - os: macos-latest - cross: true - file-ext: "" - target: armv7-unknown-linux-gnueabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-gnueabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-musleabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-unknown-linux-musleabihf - os: ubuntu-20.04 - cross: true - file-ext: "" + - target: armv7-linux-androideabi - target: arm-unknown-linux-gnueabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-gnueabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-musleabi - os: ubuntu-20.04 - cross: true - file-ext: "" - target: arm-unknown-linux-musleabihf - os: ubuntu-20.04 - cross: true - file-ext: "" - target: armv7-linux-androideabi - os: ubuntu-20.04 - cross: true - file-ext: "" + - target: x86_64-pc-windows-msvc + os: windows-latest + cross: false + - target: x86_64-apple-darwin + os: macos-latest + cross: false + - target: aarch64-apple-darwin + os: macos-latest + cross: false + - target: aarch64-apple-ios + os: macos-latest + cross: false runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: ${{ matrix.target }} - override: true - - name: build - uses: actions-rs/cargo@v1 + uses: dtolnay/rust-toolchain@master with: - use-cross: ${{ matrix.cross }} - command: build - args: --release -p kaminari-cmd --target=${{ matrix.target }} - - name: pack + toolchain: nightly + targets: ${{ matrix.target }} + - name: install cross + if: ${{ matrix.cross }} + run: cargo install cross --git https://github.com/cross-rs/cross + - name: build cross + if: ${{ matrix.cross }} + run: cross build --release -p kaminari-cmd --target=${{ matrix.target }} + - name: build native + if: ${{ !matrix.cross }} + run: cargo build --release -p kaminari-cmd --target=${{ matrix.target }} + - name: pack unix + if: "!contains(matrix.target, 'windows')" run: | - mkdir -p release-${{ matrix.target }} - cd release-${{ matrix.target }} - tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris${{ matrix.file-ext }} kaminaric${{ matrix.file-ext }} + mkdir -p build-${{ matrix.target }} + cd build-${{ matrix.target }} + tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris kaminaric + openssl dgst -sha256 -r kaminari-${{ matrix.target }}.tar.gz > kaminari-${{ matrix.target }}.sha256 + - name: pack windows + if: "contains(matrix.target, 'windows')" + run: | + mkdir -p build-${{ matrix.target }} + cd build-${{ matrix.target }} + tar -C ../target/${{ matrix.target }}/release -zcf kaminari-${{ matrix.target }}.tar.gz kaminaris.exe kaminaric.exe openssl dgst -sha256 -r kaminari-${{ matrix.target }}.tar.gz > kaminari-${{ matrix.target }}.sha256 - - name: release uses: softprops/action-gh-release@v1 with: diff --git a/Cargo.lock b/Cargo.lock index 3d557a2..57683ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,18 +38,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" - [[package]] name = "base64" version = "0.21.5" @@ -65,12 +53,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - [[package]] name = "cc" version = "1.0.83" @@ -166,50 +148,41 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "js-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "kaminari" -version = "0.11.0" +version = "0.12.0" dependencies = [ "lazy_static", "lightws", - "rcgen 0.11.3", - "rustls-pemfile 2.0.0", + "rcgen", + "rustls-pemfile", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "udpflow", - "webpki-roots 0.26.0", + "webpki-roots", ] [[package]] name = "kaminari" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a44efce1123e3bb26326f6636f1ca866bd8f37b861c3c1d3e3397e1106b5de8" +checksum = "3c541e827c508320bc8e7d5378c931aa9d3e71ed8d550024756fa0988764abf6" dependencies = [ "lazy_static", "lightws", - "rcgen 0.10.0", - "rustls-pemfile 1.0.4", + "rcgen", + "rustls-pemfile", "tokio", - "tokio-rustls 0.24.1", - "webpki-roots 0.23.1", + "tokio-rustls", + "webpki-roots", ] [[package]] name = "kaminari-cmd" -version = "0.5.7" +version = "0.6.0" dependencies = [ "anyhow", - "kaminari 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kaminari 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "realm_io", "realm_syscall", "tokio", @@ -223,17 +196,17 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "lightws" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebc8b55f95ba90dfb1e12324dd1d5dad75aa1826034baef6e558b2573abb0d6" +checksum = "8414f5f71e7568b8b38d0b42a028ae1060fc164e24abfbb4384d9af111f467f8" dependencies = [ - "base64 0.20.0", + "base64", "cfg-if", "httparse", "rand", @@ -282,28 +255,13 @@ dependencies = [ "memchr", ] -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - [[package]] name = "pem" -version = "1.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "pem" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" -dependencies = [ - "base64 0.21.5", + "base64", "serde", ] @@ -375,24 +333,12 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem 1.1.1", - "ring 0.16.20", - "time", - "yasna", -] - -[[package]] -name = "rcgen" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" +checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" dependencies = [ - "pem 3.0.2", - "ring 0.16.20", + "pem", + "ring", "time", "yasna", ] @@ -409,30 +355,15 @@ dependencies = [ [[package]] name = "realm_syscall" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edff993b2672552f1c9afd483b8704263b0a4d7d37620e5c4a7e6760f6f9868" +checksum = "e59aa61541fb76e4216da9eb43cdebd63d4ba2874e802aee31c77d57c703d17c" dependencies = [ "daemonize", "libc", "socket2", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.7" @@ -442,8 +373,8 @@ dependencies = [ "cc", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys", ] @@ -453,18 +384,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring 0.17.7", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.22.1" @@ -472,29 +391,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe6b63262c9fcac8659abfaa96cac103d28166d3ff3eaf8f412e19f3ae9e5a48" dependencies = [ "log", - "ring 0.17.7", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.0", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.5", -] - [[package]] name = "rustls-pemfile" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ - "base64 0.21.5", + "base64", "rustls-pki-types", ] @@ -504,45 +414,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7673e0aa20ee4937c6aacfc12bb8341cfbf054cdd21df6bec5fd0629fe9339b" -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - [[package]] name = "rustls-webpki" version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de2635c8bc2b88d367767c5de8ea1d8db9af3f6219eba28442242d9ab81d1b89" dependencies = [ - "ring 0.17.7", + "ring", "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -586,12 +466,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -606,9 +480,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.39" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -659,23 +533,13 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.10", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.1", + "rustls", "rustls-pki-types", "tokio", ] @@ -701,12 +565,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -725,79 +583,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasm-bindgen" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[package]] -name = "web-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] - [[package]] name = "webpki-roots" version = "0.26.0" @@ -807,28 +592,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index 23fbd3f..cf38639 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] members = ["kaminari", "cmd"] +resolver = "2" [profile.release] opt-level = 3 diff --git a/cmd/Cargo.toml b/cmd/Cargo.toml index c3e58bf..72c0d15 100644 --- a/cmd/Cargo.toml +++ b/cmd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaminari-cmd" -version = "0.5.7" +version = "0.6.0" edition = "2021" authors = ["zephyr "] repository = "https://github.com/zephyrchien/kaminari/cmd" @@ -12,7 +12,7 @@ license = "GPL-3.0" anyhow = "1" realm_io = "0.4.0" realm_syscall = "0.1.6" -kaminari = { version = "0.11", features = ["ws"] } +kaminari = { version = "0.12", features = ["ws"] } tokio = { version = "1.9", features = ["rt", "net", "macros"] } [[bin]]