Skip to content

Commit

Permalink
Merge pull request #24 from shinolab/develop
Browse files Browse the repository at this point in the history
update deps
  • Loading branch information
s5suzuki authored Jul 26, 2024
2 parents 62facf9 + 0675d5e commit 1c3c314
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 65 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
73 changes: 37 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SOEMAUTDServer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions TwinCATAUTDServerLightweight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
8 changes: 4 additions & 4 deletions simulator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down

0 comments on commit 1c3c314

Please sign in to comment.