diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17a51dc..8495648 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,17 +53,3 @@ jobs: python3 build.py build python3 build.py lint if: ${{ needs.changed-files.outputs.src == 'true' }} - - auto-merge: - needs: - - test - permissions: - pull-requests: write - contents: write - runs-on: ubuntu-latest - if: ${{ always() && !cancelled() && !failure() && github.actor == 'dependabot[bot]' }} - steps: - - run: gh pr merge --auto "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/Cargo.lock b/Cargo.lock index 82fa7ee..03a707d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.8" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", "clap_derive", @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", @@ -1076,9 +1076,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2852,7 +2852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -3105,6 +3105,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "nalgebra" version = "0.32.6" @@ -3390,16 +3402,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.5.11" @@ -4023,7 +4025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.68", @@ -4513,18 +4515,18 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4533,9 +4535,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.118" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", @@ -5162,9 +5164,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", @@ -5262,9 +5264,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli", "ctor", @@ -5468,27 +5470,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -6756,7 +6757,7 @@ dependencies = [ "instant", "libc", "log", - "mio", + "mio 0.8.11", "ndk 0.7.0", "objc2", "once_cell", diff --git a/SOEMAUTDServer/Cargo.toml b/SOEMAUTDServer/Cargo.toml index 1e0968b..b6d8042 100644 --- a/SOEMAUTDServer/Cargo.toml +++ b/SOEMAUTDServer/Cargo.toml @@ -11,8 +11,8 @@ readme = "README.md" keywords = ["autd"] [dependencies] -clap = { version = "4.3.0", features = ["derive"] } -tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } +clap = { version = "4.5.11", features = ["derive"] } +tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] } autd3-protobuf = { version = "27.0.0-alpha.3", features = ["lightweight", "async-trait"] } autd3-link-soem = { version = "27.0.0-alpha.3", features = ["async-trait"] } autd3-driver = { version = "27.0.0-alpha.3", features = ["async-trait"] } diff --git a/TwinCATAUTDServerLightweight/Cargo.toml b/TwinCATAUTDServerLightweight/Cargo.toml index 38cabdd..8442fd9 100644 --- a/TwinCATAUTDServerLightweight/Cargo.toml +++ b/TwinCATAUTDServerLightweight/Cargo.toml @@ -11,8 +11,8 @@ readme = "README.md" keywords = ["autd"] [dependencies] -clap = { version = "4.3.0", features = ["derive"] } -tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } +clap = { version = "4.5.11", features = ["derive"] } +tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] } autd3-protobuf = { version = "27.0.0-alpha.3", features = ["lightweight", "async-trait"] } autd3-link-twincat = { version = "27.0.0-alpha.3", features = ["async-trait"] } anyhow = "1.0.72" diff --git a/package-lock.json b/package-lock.json index 6d09121..43ce0ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "svelte-check": "^3.8.4", "svelte-preprocess": "^6.0.2", "tslib": "^2.6.3", - "typescript": "^5.0.2", + "typescript": "^5.5.4", "vite": "^4.4.4" } }, @@ -1564,9 +1564,9 @@ "dev": true }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index ed174ac..56f1e43 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "svelte-preprocess": "^6.0.2", "tslib": "^2.6.3", "svelte": "^4.2.18", - "typescript": "^5.0.2", + "typescript": "^5.5.4", "vite": "^4.4.4", "@tauri-apps/cli": "^1.6.0" } diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml index d83f5a6..a97d1f1 100644 --- a/simulator/Cargo.toml +++ b/simulator/Cargo.toml @@ -19,18 +19,18 @@ bitflags = "2.3.1" bytemuck = { version = "1.13.1", features = ["derive", "extern_crate_std", "min_const_generics"] } camera_controllers = "0.34.0" cgmath = "0.18.0" -clap = { version = "4.3.0", features = ["derive"] } +clap = { version = "4.5.11", features = ["derive"] } png = "0.17.8" imgui = "0.12.0" scarlet = "1.2.0" -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.96" +serde_json = "1.0.120" +serde = { version = "1.0.204", features = ["derive"] } vulkano = "0.34.1" vulkano-shaders = "0.34.0" winit = "0.28.6" crossbeam-channel = "0.5.8" image = "0.25.0" -tokio = { version = "1.34.0", features = ["rt-multi-thread"] } +tokio = { version = "1.39.1", features = ["rt-multi-thread"] } futures-util = "0.3.28" tonic = "0.12.1" anyhow = "1.0.83" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4a85a35..ba36eaa 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -15,13 +15,13 @@ rust-version = "1.60" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.4.0", features = [] } +tauri-build = { version = "1.5.3", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.6.1", features = ["window-all", "shell-sidecar", "dialog-all", "notification-all", "os-all", "path-all"] } -tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread", "time", "process"] } +tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread", "time", "process"] } autd3-driver = { version = "27.0.0-alpha.3", features = ["serde"] } autd3-link-soem = { version = "27.0.0-alpha.3", features = ["serde"] }