diff --git a/Cargo.lock b/Cargo.lock index d986bf5c..6e46b599 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,7 +153,7 @@ dependencies = [ "arbitrary", "enum-as-inner 0.5.1", "flate2", - "loro-common 0.16.12", + "loro-common 1.0.0-beta.5", "rand", "serde_json", ] @@ -642,7 +642,7 @@ dependencies = [ "dev-utils", "ensure-cov", "flate2", - "loro 0.16.12", + "loro 1.0.0-beta.5", "rand", "serde_json", "tabled 0.15.0", @@ -700,9 +700,9 @@ dependencies = [ "fxhash", "itertools 0.12.1", "loro 0.16.12", - "loro 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", "loro 0.16.2 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@0.16.7)", "loro 0.16.2 (git+https://github.com/loro-dev/loro.git?rev=90470658435ec4c62b5af59ebb82fe9e1f5aa761)", + "loro 1.0.0-beta.5", "num_cpus", "pretty_assertions", "rand", @@ -1050,33 +1050,33 @@ dependencies = [ [[package]] name = "loro" version = "0.16.12" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" dependencies = [ - "anyhow", - "ctor 0.2.6", - "dev-utils", "enum-as-inner 0.6.0", "generic-btree", "loro-common 0.16.12", "loro-delta 0.16.12", "loro-internal 0.16.12", "loro-kv-store 0.16.2", - "pretty_assertions", - "rand", - "serde_json", "tracing", ] [[package]] name = "loro" -version = "0.16.12" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +version = "1.0.0-beta.5" dependencies = [ + "anyhow", + "ctor 0.2.6", + "dev-utils", "enum-as-inner 0.6.0", "generic-btree", - "loro-common 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-delta 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-internal 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-kv-store 0.16.2 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", + "loro-common 1.0.0-beta.5", + "loro-delta 1.0.0-beta.5", + "loro-internal 1.0.0-beta.5", + "loro-kv-store 1.0.0-beta.5", + "pretty_assertions", + "rand", + "serde_json", "tracing", ] @@ -1115,11 +1115,11 @@ dependencies = [ [[package]] name = "loro-common" version = "0.16.12" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" dependencies = [ "arbitrary", "enum-as-inner 0.6.0", "fxhash", - "js-sys", "leb128", "loro-rle 0.16.12", "nonmax", @@ -1128,25 +1128,25 @@ dependencies = [ "serde_json", "string_cache", "thiserror", - "wasm-bindgen", ] [[package]] name = "loro-common" -version = "0.16.12" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +version = "1.0.0-beta.5" dependencies = [ "arbitrary", "enum-as-inner 0.6.0", "fxhash", + "js-sys", "leb128", - "loro-rle 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", + "loro-rle 1.0.0-beta.5", "nonmax", "serde", "serde_columnar", "serde_json", "string_cache", "thiserror", + "wasm-bindgen", ] [[package]] @@ -1176,6 +1176,18 @@ dependencies = [ [[package]] name = "loro-delta" version = "0.16.12" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +dependencies = [ + "arrayvec", + "enum-as-inner 0.5.1", + "generic-btree", + "heapless 0.8.0", + "tracing", +] + +[[package]] +name = "loro-delta" +version = "1.0.0-beta.5" dependencies = [ "arrayvec", "color-backtrace", @@ -1189,23 +1201,11 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "loro-delta" -version = "0.16.12" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" -dependencies = [ - "arrayvec", - "enum-as-inner 0.5.1", - "generic-btree", - "heapless 0.8.0", - "tracing", -] - [[package]] name = "loro-ffi" version = "0.16.2" dependencies = [ - "loro 0.16.12", + "loro 1.0.0-beta.5", "serde_json", ] @@ -1282,6 +1282,47 @@ dependencies = [ [[package]] name = "loro-internal" version = "0.16.12" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +dependencies = [ + "append-only-bytes", + "arref", + "bytes", + "either", + "ensure-cov", + "enum-as-inner 0.6.0", + "enum_dispatch", + "fxhash", + "generic-btree", + "getrandom", + "im", + "itertools 0.12.1", + "leb128", + "loro-common 0.16.12", + "loro-delta 0.16.12", + "loro-kv-store 0.16.2", + "loro-rle 0.16.12", + "loro_fractional_index 0.16.12", + "md5", + "nonmax", + "num", + "num-derive", + "num-traits", + "once_cell", + "postcard", + "pretty_assertions", + "rand", + "serde", + "serde_columnar", + "serde_json", + "smallvec", + "thiserror", + "tracing", + "xxhash-rust", +] + +[[package]] +name = "loro-internal" +version = "1.0.0-beta.5" dependencies = [ "append-only-bytes", "arbitrary", @@ -1305,11 +1346,11 @@ dependencies = [ "itertools 0.12.1", "js-sys", "leb128", - "loro-common 0.16.12", - "loro-delta 0.16.12", - "loro-kv-store 0.16.2", - "loro-rle 0.16.12", - "loro_fractional_index 0.16.12", + "loro-common 1.0.0-beta.5", + "loro-delta 1.0.0-beta.5", + "loro-kv-store 1.0.0-beta.5", + "loro-rle 1.0.0-beta.5", + "loro_fractional_index 1.0.0-beta.5", "md5", "miniz_oxide 0.7.1", "nonmax", @@ -1334,77 +1375,36 @@ dependencies = [ "zstd", ] -[[package]] -name = "loro-internal" -version = "0.16.12" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" -dependencies = [ - "append-only-bytes", - "arref", - "bytes", - "either", - "ensure-cov", - "enum-as-inner 0.6.0", - "enum_dispatch", - "fxhash", - "generic-btree", - "getrandom", - "im", - "itertools 0.12.1", - "leb128", - "loro-common 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-delta 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-kv-store 0.16.2 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro-rle 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "loro_fractional_index 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", - "md5", - "nonmax", - "num", - "num-derive", - "num-traits", - "once_cell", - "postcard", - "pretty_assertions", - "rand", - "serde", - "serde_columnar", - "serde_json", - "smallvec", - "thiserror", - "tracing", - "xxhash-rust", -] - [[package]] name = "loro-kv-store" version = "0.16.2" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" dependencies = [ "bytes", - "ctor 0.2.6", - "dev-utils", "ensure-cov", "fxhash", "loro-common 0.16.12", "lz4_flex", "once_cell", "quick_cache", - "rand", "tracing", "xxhash-rust", ] [[package]] name = "loro-kv-store" -version = "0.16.2" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +version = "1.0.0-beta.5" dependencies = [ "bytes", + "ctor 0.2.6", + "dev-utils", "ensure-cov", "fxhash", - "loro-common 0.16.12 (git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4)", + "loro-common 1.0.0-beta.5", "lz4_flex", "once_cell", "quick_cache", + "rand", "tracing", "xxhash-rust", ] @@ -1438,6 +1438,19 @@ dependencies = [ [[package]] name = "loro-rle" version = "0.16.12" +source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" +dependencies = [ + "append-only-bytes", + "arref", + "enum-as-inner 0.6.0", + "fxhash", + "num", + "smallvec", +] + +[[package]] +name = "loro-rle" +version = "1.0.0-beta.5" dependencies = [ "append-only-bytes", "ctor 0.1.26", @@ -1449,19 +1462,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "loro-rle" -version = "0.16.12" -source = "git+https://github.com/loro-dev/loro.git?tag=loro-crdt@1.0.0-alpha.4#9bfe97bce4912c6dc8439817497d18423a0e8cb7" -dependencies = [ - "append-only-bytes", - "arref", - "enum-as-inner 0.6.0", - "fxhash", - "num", - "smallvec", -] - [[package]] name = "loro-thunderdome" version = "0.6.2" @@ -1475,8 +1475,8 @@ dependencies = [ "console_error_panic_hook", "getrandom", "js-sys", - "loro-internal 0.16.12", - "loro-rle 0.16.12", + "loro-internal 1.0.0-beta.5", + "loro-rle 1.0.0-beta.5", "serde", "serde-wasm-bindgen", "serde_json", @@ -1508,17 +1508,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "loro_fractional_index" -version = "0.16.12" -dependencies = [ - "criterion 0.5.1", - "fractional_index", - "once_cell", - "rand", - "serde", -] - [[package]] name = "loro_fractional_index" version = "0.16.12" @@ -1531,6 +1520,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "loro_fractional_index" +version = "1.0.0-beta.5" +dependencies = [ + "criterion 0.5.1", + "fractional_index", + "once_cell", + "rand", + "serde", +] + [[package]] name = "lz4_flex" version = "0.11.3" diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml index f1e95775..119e89ec 100644 --- a/crates/delta/Cargo.toml +++ b/crates/delta/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-delta" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" description = "Loro internal library. It's used as a delta between two versions of text or lists. It's also an efficient Rope." diff --git a/crates/fractional_index/Cargo.toml b/crates/fractional_index/Cargo.toml index 92204daa..b4152ac6 100644 --- a/crates/fractional_index/Cargo.toml +++ b/crates/fractional_index/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro_fractional_index" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" description = "Fraction index for Loro. Fork and modified from jamsocket/fractional_index" diff --git a/crates/kv-store/Cargo.toml b/crates/kv-store/Cargo.toml index 57941ab2..c123b534 100644 --- a/crates/kv-store/Cargo.toml +++ b/crates/kv-store/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "loro-kv-store" -version = "0.16.2" +version = "1.0.0-beta.5" edition = "2021" [dependencies] -loro-common = { path = "../loro-common", version = "0.16.2" } +loro-common = { path = "../loro-common", version = "1.0.0-beta.5" } bytes = { workspace = true } fxhash = { workspace = true } once_cell = { workspace = true } diff --git a/crates/loro-common/Cargo.toml b/crates/loro-common/Cargo.toml index 528a01d1..df7ad62f 100644 --- a/crates/loro-common/Cargo.toml +++ b/crates/loro-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-common" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" description = "Common types and functions for Loro. This is an internal lib of Loro." @@ -14,7 +14,7 @@ keywords = ["crdt", "local-first"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rle = { path = "../rle", version = "0.16.12", package = "loro-rle" } +rle = { path = "../rle", version = "1.0.0-beta.5", package = "loro-rle" } serde = { workspace = true } serde_json = { workspace = true, optional=true } thiserror = "1.0.43" diff --git a/crates/loro-internal/Cargo.toml b/crates/loro-internal/Cargo.toml index 07691d90..ebb65a5a 100644 --- a/crates/loro-internal/Cargo.toml +++ b/crates/loro-internal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-internal" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" description = "Loro internal library. Do not use it directly as it's not stable." @@ -16,13 +16,13 @@ keywords = ["crdt", "local-first"] [dependencies] generic-btree = { version = "^0.10.5" } smallvec = { workspace = true } -loro-delta = { path = "../delta", version = "0.16.12", package = "loro-delta" } -rle = { path = "../rle", version = "0.16.12", package = "loro-rle" } -loro-common = { path = "../loro-common", version = "0.16.12" } +loro-delta = { path = "../delta", version = "1.0.0-beta.5", package = "loro-delta" } +rle = { path = "../rle", version = "1.0.0-beta.5", package = "loro-rle" } +loro-common = { path = "../loro-common", version = "1.0.0-beta.5" } fractional_index = { path = "../fractional_index", features = [ "serde", -], version = "0.16.2", package = "loro_fractional_index" } -loro-kv-store = { path = "../kv-store", version = "0.16.2" } +], version = "1.0.0-beta.5", package = "loro_fractional_index" } +loro-kv-store = { path = "../kv-store", version = "1.0.0-beta.5" } fxhash = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } diff --git a/crates/loro-internal/fuzz/Cargo.toml b/crates/loro-internal/fuzz/Cargo.toml index a75e6a13..4ed7f75f 100644 --- a/crates/loro-internal/fuzz/Cargo.toml +++ b/crates/loro-internal/fuzz/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-internal-fuzz" -version = "0.0.0" +version = "1.0.0-beta.5" authors = ["Automatically generated"] publish = false edition = "2018" diff --git a/crates/loro/Cargo.toml b/crates/loro/Cargo.toml index aceeec92..65bbf2ea 100644 --- a/crates/loro/Cargo.toml +++ b/crates/loro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" documentation = "https://docs.rs/loro/" @@ -14,10 +14,10 @@ keywords = ["crdt", "local-first"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -loro-internal = { path = "../loro-internal", version = "0.16.2" } -loro-common = { path = "../loro-common", version = "0.16.2", features = ["serde_json"] } -loro-kv-store = { path = "../kv-store", version = "0.16.2" } -delta = { path = "../delta", package = "loro-delta", version = "0.16.2" } +loro-internal = { path = "../loro-internal", version = "1.0.0-beta.5" } +loro-common = { path = "../loro-common", version = "1.0.0-beta.5", features = ["serde_json"] } +loro-kv-store = { path = "../kv-store", version = "1.0.0-beta.5" } +delta = { path = "../delta", package = "loro-delta", version = "1.0.0-beta.5" } generic-btree = { version = "^0.10.5" } enum-as-inner = { workspace = true } tracing = { workspace = true } diff --git a/crates/rle/Cargo.toml b/crates/rle/Cargo.toml index 2d37f06e..b240e4aa 100644 --- a/crates/rle/Cargo.toml +++ b/crates/rle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-rle" -version = "0.16.12" +version = "1.0.0-beta.5" edition = "2021" license = "MIT" description = "A internal library of loro for storing and manipulating run-length encoded data. Do not use it directly." diff --git a/scripts/bump-rust-crates.ts b/scripts/bump-rust-crates.ts index fa866574..4beb650c 100644 --- a/scripts/bump-rust-crates.ts +++ b/scripts/bump-rust-crates.ts @@ -7,6 +7,7 @@ const CRATES = { "loro-common": "loro-common", "rle": "loro-rle", "delta": "loro-delta", + "kv-store": "loro-kv-store", "fractional_index": "loro_fractional_index", }; @@ -22,8 +23,7 @@ async function updateCargoToml(filePath: string, targetVersion: string) { // Update dependencies const depRegex = new RegExp( - `^(\\s*)(${ - crates.join("|") + `^(\\s*)(${crates.join("|") })\\s*=\\s*(?:("\\S+"|\\{[^}]*version\\s*=\\s*)("[^"]*"))`, "gm", );