Skip to content

Commit 1356867

Browse files
authored
Revert "refactor: introduce statefull sub-modules" (#46)
Revert "refactor: introduce statefull sub-modules (#44)" This reverts commit fd9c85d.
1 parent fd9c85d commit 1356867

15 files changed

+1006
-962
lines changed

Cargo.lock

Lines changed: 170 additions & 169 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
authors = ["omnect@conplement.de"]
33
description = "WebService providing access to omnect device features."
4-
edition = "2024"
4+
edition = "2021"
55
homepage = "https://www.omnect.io/home"
66
license = "MIT OR Apache-2.0"
77
name = "omnect-ui"
88
readme = "README.md"
99
repository = "git@github.com:omnect/omnect-ui.git"
10-
version = "0.14.2"
10+
version = "0.14.1"
1111
build = "src/build.rs"
1212

1313
[dependencies]
@@ -16,9 +16,9 @@ actix-multipart = { version = "0.7", default-features = false, features = [
1616
"tempfile",
1717
"derive"
1818
]}
19-
actix-session = { version = "0.10", features = ["cookie-session"] }
20-
actix-server = { version = "2.6", default-features = false }
21-
actix-web = { version = "4.11", default-features = false, features = [
19+
actix-rt = { version = "2.10", default-features = false }
20+
actix-session = { version = "0.10.1", features = ["cookie-session"] }
21+
actix-web = { version = "4.9", default-features = false, features = [
2222
"macros",
2323
"rustls-0_23",
2424
] }
@@ -28,17 +28,16 @@ argon2 = { version = "0.5", default-features = false, features = ["password-hash
2828
base64 = { version = "0.22", default-features = false }
2929
env_logger = { version = "0.11", default-features = false }
3030
http-body-util = { version = "0.1", default-features = false }
31-
hyper = { version = "1.6", default-features = false, features = [
31+
hyper = { version = "1.3", default-features = false, features = [
3232
"client",
3333
"http1",
3434
] }
35-
hyperlocal = { version = "0.9", default-features = false, features = ["client"] }
3635
hyper-util = { version = "0.1", default-features = false, features = ["tokio"] }
3736
jwt-simple = { version = "0.12", default-features = false, features = [
3837
"optimal",
3938
] }
4039
log = { version = "0.4", default-features = false }
41-
log-panics = { version = "2.1", default-features = false, features = [
40+
log-panics = { version = "2.0", default-features = false, features = [
4241
"with-backtrace",
4342
] }
4443
rand_core = { version = "0.9", default-features = false, features = ["std"] }
@@ -57,19 +56,20 @@ serde_json = { version = "1.0", default-features = false, features = [
5756
"raw_value",
5857
] }
5958
serde_repr = { version = "0.1", default-features = false }
60-
tokio = { version = "1.45", default-features = false, features = [
59+
tokio = { version = "1.0", default-features = false, features = [
6160
"macros",
6261
"net",
6362
"process",
6463
] }
65-
uuid = { version = "1.17", default-features = false, features = [
64+
uuid = { version = "1.16", default-features = false, features = [
6665
"v4",
6766
] }
6867

6968
[features]
7069
mock = []
7170

7271
[dev-dependencies]
73-
actix-http = "3.11"
72+
actix-http = "3.10"
7473
actix-service = "2.0"
75-
tempfile = "3.20.0"
74+
base64 = "0.22.1"
75+
tempfile = "3.19.1"

build-and-run-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# local build and run
44
omnect_ui_version=$(toml get --raw Cargo.toml package.version)
5-
rust_version="1.87.0-bookworm"
5+
rust_version="1.84.1-bookworm"
66
omnect_ui_port="1977"
77
centrifugo_port="8000"
88

build-arm64-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ omnect_ui_version=$(toml get --raw Cargo.toml package.version)
55

66
docker buildx build \
77
--build-arg=DOCKER_NAMESPACE=omnectweucopsacr.azurecr.io \
8-
--build-arg=VERSION_RUST_CONTAINER=1.87.0-bookworm \
8+
--build-arg=VERSION_RUST_CONTAINER=1.84.1-bookworm \
99
--platform linux/arm64 \
1010
--load \
1111
-f Dockerfile . \

0 commit comments

Comments
 (0)