Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
339 changes: 169 additions & 170 deletions Cargo.lock

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
authors = ["omnect@conplement.de"]
description = "WebService providing access to omnect device features."
edition = "2021"
edition = "2024"
homepage = "https://www.omnect.io/home"
license = "MIT OR Apache-2.0"
name = "omnect-ui"
readme = "README.md"
repository = "git@github.com:omnect/omnect-ui.git"
version = "0.14.1"
version = "0.14.2"
build = "src/build.rs"

[dependencies]
Expand All @@ -16,9 +16,9 @@ actix-multipart = { version = "0.7", default-features = false, features = [
"tempfile",
"derive"
]}
actix-rt = { version = "2.10", default-features = false }
actix-session = { version = "0.10.1", features = ["cookie-session"] }
actix-web = { version = "4.9", default-features = false, features = [
actix-session = { version = "0.10", features = ["cookie-session"] }
actix-server = { version = "2.6", default-features = false }
actix-web = { version = "4.11", default-features = false, features = [
"macros",
"rustls-0_23",
] }
Expand All @@ -28,16 +28,17 @@ argon2 = { version = "0.5", default-features = false, features = ["password-hash
base64 = { version = "0.22", default-features = false }
env_logger = { version = "0.11", default-features = false }
http-body-util = { version = "0.1", default-features = false }
hyper = { version = "1.3", default-features = false, features = [
hyper = { version = "1.6", default-features = false, features = [
"client",
"http1",
] }
hyperlocal = { version = "0.9", default-features = false, features = ["client"] }
hyper-util = { version = "0.1", default-features = false, features = ["tokio"] }
jwt-simple = { version = "0.12", default-features = false, features = [
"optimal",
] }
log = { version = "0.4", default-features = false }
log-panics = { version = "2.0", default-features = false, features = [
log-panics = { version = "2.1", default-features = false, features = [
"with-backtrace",
] }
rand_core = { version = "0.9", default-features = false, features = ["std"] }
Expand All @@ -56,20 +57,19 @@ serde_json = { version = "1.0", default-features = false, features = [
"raw_value",
] }
serde_repr = { version = "0.1", default-features = false }
tokio = { version = "1.0", default-features = false, features = [
tokio = { version = "1.45", default-features = false, features = [
"macros",
"net",
"process",
] }
uuid = { version = "1.16", default-features = false, features = [
uuid = { version = "1.17", default-features = false, features = [
"v4",
] }

[features]
mock = []

[dev-dependencies]
actix-http = "3.10"
actix-http = "3.11"
actix-service = "2.0"
base64 = "0.22.1"
tempfile = "3.19.1"
tempfile = "3.20.0"
2 changes: 1 addition & 1 deletion build-and-run-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# local build and run
omnect_ui_version=$(toml get --raw Cargo.toml package.version)
rust_version="1.84.1-bookworm"
rust_version="1.87.0-bookworm"
omnect_ui_port="1977"
centrifugo_port="8000"

Expand Down
2 changes: 1 addition & 1 deletion build-arm64-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ omnect_ui_version=$(toml get --raw Cargo.toml package.version)

docker buildx build \
--build-arg=DOCKER_NAMESPACE=omnectweucopsacr.azurecr.io \
--build-arg=VERSION_RUST_CONTAINER=1.84.1-bookworm \
--build-arg=VERSION_RUST_CONTAINER=1.87.0-bookworm \
--platform linux/arm64 \
--load \
-f Dockerfile . \
Expand Down
Loading
Loading