Skip to content

Commit

Permalink
chore: bump deps & jni (#545)
Browse files Browse the repository at this point in the history
  • Loading branch information
@darkskygit
darkskygit authored Oct 9, 2023
1 parent 954668a commit a160a2c
Show file tree
Hide file tree
Showing 16 changed files with 437 additions and 444 deletions.
692 changes: 332 additions & 360 deletions Cargo.lock
View file

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ members = [
resolver = "2"

[workspace.dependencies]
anyhow = "1.0.75"
async-trait = "0.1.73"
bytes = "1.5.0"
chrono = "0.4.31"
futures = "0.3.28"
nanoid = "0.4.0"
rand = "0.8.5"
serde = "1.0.188"
serde_json = "1.0.107"
thiserror = "1.0.49"
tokio = "1"

jwst = { workspace = true, path = "libs/jwst" }
jwst-codec = { workspace = true, path = "libs/jwst-codec" }
jwst-core = { workspace = true, path = "libs/jwst-core" }
Expand Down
7 changes: 5 additions & 2 deletions apps/doc_merger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ license = "AGPL-3.0-only"

[dependencies]
clap = { version = "4.3.19", features = ["derive"] }
jwst-codec = { workspace = true, features = ["debug", "large_refs"] }
serde_json = "1.0.105"
lib0 = { version = "0.16.5", features = ["lib0-serde"] }
yrs = "0.16.5"
assert-json-diff = "2.0.2"

# ======== workspace dependencies ========
serde_json = { workspace = true }

jwst-codec = { workspace = true, features = ["debug", "large_refs"] }
15 changes: 8 additions & 7 deletions apps/keck/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@ api = ["utoipa"]
schema = ["utoipa-swagger-ui"]

[dependencies]
anyhow = "1.0.70"
axum = { version = "0.6.20", features = ["headers", "ws"] }
cfg-if = "1.0.0"
futures = "0.3.28"
log = { version = "0.4.17", features = [
"max_level_trace",
"release_max_level_info",
] }
dotenvy = "0.15.7"
mimalloc = "0.1.36"
nanoid = "0.4.0"
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
sqlx = { version = "0.7.1", features = [
"chrono",
"macros",
Expand All @@ -40,7 +35,6 @@ sqlx = { version = "0.7.1", features = [
] }
tower = "0.4.13"
tower-http = { version = "0.4.0", features = ["cors"] }
thiserror = "1.0.40"
time = "0.3.20"
tokio = { version = "=1.28.0", features = [
"macros",
Expand All @@ -50,13 +44,20 @@ tokio = { version = "=1.28.0", features = [
utoipa = { version = "3.5.0", features = ["axum_extras"], optional = true }
utoipa-swagger-ui = { version = "3.1.5", optional = true }
libc = "0.2.147"
rand = "0.8.5"
reqwest = { version = "0.11.19", default-features = false, features = [
"json",
"rustls-tls",
] }

# ======= workspace dependencies =======
anyhow = { workspace = true }
futures = { workspace = true }
nanoid = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }

jwst-core = { workspace = true }
jwst-logger = { workspace = true }
jwst-rpc = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions apps/swift/OctoBaseSwift/RustXcframework.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64-simulator</string>
<key>LibraryPath</key>
<string>liboctobase.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -17,12 +17,14 @@
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>liboctobase.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -31,8 +33,6 @@
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
Expand Down
11 changes: 6 additions & 5 deletions libs/jwst-binding/jwst-jni/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
[package]
name = "jwst-jni"
version = "0.1.0"
version = "0.2.5"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
android_logger = "0.13.3"
futures = "0.3.28"
jni-sys = "0.3.0"
log = { package = "tracing", version = "0.1.37" }
nanoid = "0.4.0"
rifgen = "0.1.61"
tokio = "1"

# ======= workspace dependencies =======
futures = { workspace = true }
nanoid = { workspace = true }
tokio = { workspace = true }

jwst-codec = { workspace = true }
jwst-core = { workspace = true, features = ["large_refs"] }
jwst-rpc = { workspace = true }
jwst-storage = { workspace = true, features = ["sqlite"] }

[build-dependencies]
flapigen = { git = "https://github.com/Dushistov/flapigen-rs", rev = "7d343c6" } # 0.6.0-pre13
flapigen = "0.6.0"
rifgen = "0.1.61"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion libs/jwst-binding/jwst-jni/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ publishing {
release(MavenPublication) {
groupId = 'com.toeverything'
artifactId = 'octobase'
version = '0.2.4'
version = '0.2.5'

afterEvaluate {
from components.release
Expand Down
21 changes: 11 additions & 10 deletions libs/jwst-binding/jwst-swift/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
[package]
name = "jwst-swift"
version = "0.1.0"
version = "0.1.37"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
chrono = "0.4.26"
futures = "0.3.28"
swift-bridge = "0.1.51"
tokio = "1.27.0"
nanoid = "0.4.0"
serde = { version = "1.0.183", features = ["derive"] }
serde_json = "1.0.104"
swift-bridge = "0.1.52"

# ======= workspace dependencies =======
chrono = { workspace = true }
futures = { workspace = true }
tokio = { workspace = true }
nanoid = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

jwst-core = { workspace = true, features = ["large_refs"] }
jwst-logger = { workspace = true }
jwst-rpc = { workspace = true }
Expand All @@ -25,10 +26,10 @@ name = "octobase"
crate-type = ["staticlib"]

[build-dependencies]
swift-bridge-build = "0.1.51"
swift-bridge-build = "0.1.52"

[dev-dependencies]
reqwest = { version = "0.11.14", default-features = false, features = [
reqwest = { version = "0.11.22", default-features = false, features = [
"json",
"rustls-tls",
] }
Expand Down
2 changes: 1 addition & 1 deletion libs/jwst-binding/jwst-swift/jwst-swift-integrate/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
swift-bridge-build = "0.1.48"
swift-bridge-build = "0.1.52"
14 changes: 8 additions & 6 deletions libs/jwst-codec-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,25 @@ bench = ["regex"]
fuzz = ["arbitrary", "phf"]

[dependencies]
arbitrary = { version = "1.3.0", features = ["derive"], optional = true }
arbitrary = { version = "1.3", features = ["derive"], optional = true }
phf = { version = "0.11", features = ["macros"], optional = true }
rand = "0.8"
rand_chacha = "0.3"
regex = { version = "1.5", optional = true }
regex = { version = "1.9", optional = true }

# ======= bench dependencies =======
jwst-codec = { workspace = true }

lib0 = { version = "=0.16.5", features = ["lib0-serde"] }
y-sync = "=0.3.1"
yrs = "=0.16.5"

# ======= workspace dependencies =======
rand = { workspace = true }

jwst-codec = { workspace = true }

[dev-dependencies]
criterion = { version = "0.5", features = ["html_reports"] }
path-ext = "0.1"
proptest = "1.2"
proptest = "1.3"
proptest-derive = "0.4"

[[bin]]
Expand Down
23 changes: 12 additions & 11 deletions libs/jwst-codec/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,19 @@ version = "0.1.0"

[dependencies]
bitvec = "1.0"
byteorder = "1.4"
nanoid = "0.4"
byteorder = "1.5"
nom = "7.1"
ordered-float = "3.9"
rand = "0.8"
ordered-float = "4.1"
rand_chacha = "0.3"
rand_distr = "0.4.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
rand_distr = "0.4"

# ======= workspace dependencies =======
nanoid = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }

jwst-logger = { workspace = true }

[features]
Expand All @@ -41,7 +42,7 @@ large_refs = []

[target.'cfg(fuzzing)'.dependencies]
arbitrary = { version = "1.3", features = ["derive"] }
ordered-float = { version = "3.9", features = ["arbitrary"] }
ordered-float = { version = "4.1", features = ["arbitrary"] }

[target.'cfg(loom)'.dependencies]
loom = { version = "0.7", features = ["checkpoint"] }
Expand All @@ -50,9 +51,9 @@ loom = { version = "0.7", features = ["checkpoint"] }
assert-json-diff = "2.0"
criterion = { version = "0.5", features = ["html_reports"] }
lib0 = { version = "0.16", features = ["lib0-serde"] }
ordered-float = { version = "3.9", features = ["proptest"] }
ordered-float = { version = "4.1", features = ["proptest"] }
path-ext = "0.1"
proptest = "1.2"
proptest = "1.3"
proptest-derive = "0.4"
yrs = "=0.16.5"

Expand Down
23 changes: 12 additions & 11 deletions libs/jwst-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ license = "AGPL-3.0-only"
large_refs = ["jwst-codec/large_refs"]

[dependencies]
async-trait = "0.1.68"
base64 = "0.21.0"
bytes = "1.4.0"
chrono = "0.4.24"
futures = "0.3.28"
nanoid = "0.4.0"
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
thiserror = "1.0.40"
tracing = { version = "0.1.37", features = ["log"] }
base64 = "0.21.4"
tracing = { version = "0.1", features = ["log"] }

# ======= workspace dependencies =======
async-trait = { workspace = true }
bytes = { workspace = true }
chrono = { workspace = true }
futures = { workspace = true }
nanoid = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }

jwst-codec = { workspace = true }

[dev-dependencies]
assert-json-diff = "2.0.2"
assert-json-diff = "2.0"
10 changes: 6 additions & 4 deletions libs/jwst-logger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ license = "AGPL-3.0-only"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
chrono = "0.4.23"
nu-ansi-term = "0.46.0"
nu-ansi-term = "0.49.0"
tracing = { version = "0.1.37", features = ["log"] }
tracing-log = { version = "0.1.3", features = [
"log-tracer",
"std",
], default-features = false }
tracing-stackdriver = "0.6.2"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
tracing-stackdriver = "0.8.0"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }

# ======= workspace dependencies =======
chrono = { workspace = true }
22 changes: 9 additions & 13 deletions libs/jwst-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,14 @@ websocket = ["axum", "tokio-tungstenite", "url"]
webrtc = ["bytes", "reqwest", "webrtcrs"]

[dependencies]
anyhow = "1.0.70"
assert-json-diff = "2.0.2"
async-trait = "0.1.68"
byteorder = "1.4.3"
chrono = "0.4.26"
futures = "0.3.28"
nanoid = "0.4.0"
rand = "0.8.5"
serde = "1.0.183"
serde_json = "1.0.104"
thiserror = "1.0.40"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal"] }
# ========= workspace dependencies =========
async-trait = { workspace = true }
chrono = { workspace = true }
futures = { workspace = true }
nanoid = { workspace = true }
rand = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }

# ======== websocket dependencies ========
axum = { version = "0.6.16", features = ["ws"], optional = true }
Expand All @@ -32,7 +28,7 @@ tokio-tungstenite = { version = "0.20.0", features = [
url = { version = "2.3.1", optional = true }

# ======== webrtc dependencies ========
bytes = { version = "1.4", optional = true }
bytes = { workspace = true, optional = true }
reqwest = { version = "0.11.18", default-features = false, features = [
"json",
"rustls-tls",
Expand Down
Loading

1 comment on commit a160a2c

@vercel
Copy link

@vercel vercel bot commented on a160a2c Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

octobase – ./

crdts.cloud
octobase-git-master-toeverything.vercel.app
octobase.vercel.app
octobase-toeverything.vercel.app
octobase.pro

Please sign in to comment.