From 271cd0dd6154932f6a68116b3ca7c7e8516b2db8 Mon Sep 17 00:00:00 2001 From: appflowy Date: Sat, 27 Nov 2021 21:59:20 +0800 Subject: [PATCH] mv lib-sqlite to shared-lib --- frontend/rust-lib/Cargo.toml | 1 - frontend/rust-lib/flowy-database/Cargo.toml | 2 +- frontend/rust-lib/flowy-user/Cargo.toml | 2 +- frontend/rust-lib/flowy-workspace/Cargo.toml | 2 +- frontend/rust-lib/lib-infra/Cargo.toml | 2 +- shared-lib/Cargo.toml | 1 + {frontend/rust-lib => shared-lib}/lib-sqlite/Cargo.toml | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/conn_ext.rs | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/database.rs | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/errors.rs | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/lib.rs | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/pool.rs | 0 {frontend/rust-lib => shared-lib}/lib-sqlite/src/pragma.rs | 0 13 files changed, 5 insertions(+), 5 deletions(-) rename {frontend/rust-lib => shared-lib}/lib-sqlite/Cargo.toml (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/conn_ext.rs (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/database.rs (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/errors.rs (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/lib.rs (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/pool.rs (100%) rename {frontend/rust-lib => shared-lib}/lib-sqlite/src/pragma.rs (100%) diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index 1b7923a4cb..ca4bf6d4bc 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -2,7 +2,6 @@ members = [ "lib-dispatch", "lib-log", - "lib-sqlite", "lib-infra", "flowy-sdk", "dart-ffi", diff --git a/frontend/rust-lib/flowy-database/Cargo.toml b/frontend/rust-lib/flowy-database/Cargo.toml index 0045ecca91..35f68c1480 100644 --- a/frontend/rust-lib/flowy-database/Cargo.toml +++ b/frontend/rust-lib/flowy-database/Cargo.toml @@ -9,4 +9,4 @@ edition = "2018" diesel = {version = "1.4.8", features = ["sqlite"]} diesel_derives = {version = "1.4.1", features = ["sqlite"]} diesel_migrations = {version = "1.4.0", features = ["sqlite"]} -lib-sqlite = {path = "../lib-sqlite" } \ No newline at end of file +lib-sqlite = { path = "../../../shared-lib/lib-sqlite" } \ No newline at end of file diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml index 0bcdb4c5d6..ae70823d25 100644 --- a/frontend/rust-lib/flowy-user/Cargo.toml +++ b/frontend/rust-lib/flowy-user/Cargo.toml @@ -10,13 +10,13 @@ flowy-user-infra = { path = "../../../shared-lib/flowy-user-infra" } backend-service = { path = "../../../shared-lib/backend-service" } flowy-derive = { path = "../../../shared-lib/flowy-derive" } lib-ws = { path = "../../../shared-lib/lib-ws" } +lib-sqlite = { path = "../../../shared-lib/lib-sqlite" } derive_more = {version = "0.99", features = ["display"]} flowy-database = { path = "../flowy-database" } dart-notify = { path = "../dart-notify" } lib-dispatch = { path = "../lib-dispatch" } lib-infra = { path = "../lib-infra" } -lib-sqlite = { path = "../lib-sqlite" } tracing = { version = "0.1", features = ["log"] } bytes = "1.0" diff --git a/frontend/rust-lib/flowy-workspace/Cargo.toml b/frontend/rust-lib/flowy-workspace/Cargo.toml index 233522f4d9..d4702c08ff 100644 --- a/frontend/rust-lib/flowy-workspace/Cargo.toml +++ b/frontend/rust-lib/flowy-workspace/Cargo.toml @@ -10,6 +10,7 @@ flowy-workspace-infra = { path = "../../../shared-lib/flowy-workspace-infra" } flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" } flowy-derive = { path = "../../../shared-lib/flowy-derive" } lib-ot = { path = "../../../shared-lib/lib-ot" } +lib-sqlite = { path = "../../../shared-lib/lib-sqlite" } backend-service = { path = "../../../shared-lib/backend-service" } @@ -18,7 +19,6 @@ flowy-database = { path = "../flowy-database" } dart-notify = { path = "../dart-notify" } lib-dispatch = { path = "../lib-dispatch" } lib-infra = { path = "../lib-infra" } -lib-sqlite = { path = "../lib-sqlite" } parking_lot = "0.11" diff --git a/frontend/rust-lib/lib-infra/Cargo.toml b/frontend/rust-lib/lib-infra/Cargo.toml index 355f38d8cd..c9a9c8808a 100644 --- a/frontend/rust-lib/lib-infra/Cargo.toml +++ b/frontend/rust-lib/lib-infra/Cargo.toml @@ -11,7 +11,7 @@ diesel = {version = "1.4.8", features = ["sqlite"]} diesel_derives = {version = "1.4.1", features = ["sqlite"]} diesel_migrations = {version = "1.4.0", features = ["sqlite"]} flowy-derive = { path = "../../../shared-lib/flowy-derive" } -lib-sqlite = { path = "../lib-sqlite" } +lib-sqlite = { path = "../../../shared-lib/lib-sqlite" } lazy_static = "1.4.0" protobuf = {version = "2.18.0"} log = "0.4.14" diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml index ab26a64afb..80961d62a2 100644 --- a/shared-lib/Cargo.toml +++ b/shared-lib/Cargo.toml @@ -5,6 +5,7 @@ members = [ "flowy-document-infra", "lib-ot", "lib-ws", + "lib-sqlite", "backend-service", "flowy-derive", "flowy-ast", diff --git a/frontend/rust-lib/lib-sqlite/Cargo.toml b/shared-lib/lib-sqlite/Cargo.toml similarity index 100% rename from frontend/rust-lib/lib-sqlite/Cargo.toml rename to shared-lib/lib-sqlite/Cargo.toml diff --git a/frontend/rust-lib/lib-sqlite/src/conn_ext.rs b/shared-lib/lib-sqlite/src/conn_ext.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/conn_ext.rs rename to shared-lib/lib-sqlite/src/conn_ext.rs diff --git a/frontend/rust-lib/lib-sqlite/src/database.rs b/shared-lib/lib-sqlite/src/database.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/database.rs rename to shared-lib/lib-sqlite/src/database.rs diff --git a/frontend/rust-lib/lib-sqlite/src/errors.rs b/shared-lib/lib-sqlite/src/errors.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/errors.rs rename to shared-lib/lib-sqlite/src/errors.rs diff --git a/frontend/rust-lib/lib-sqlite/src/lib.rs b/shared-lib/lib-sqlite/src/lib.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/lib.rs rename to shared-lib/lib-sqlite/src/lib.rs diff --git a/frontend/rust-lib/lib-sqlite/src/pool.rs b/shared-lib/lib-sqlite/src/pool.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/pool.rs rename to shared-lib/lib-sqlite/src/pool.rs diff --git a/frontend/rust-lib/lib-sqlite/src/pragma.rs b/shared-lib/lib-sqlite/src/pragma.rs similarity index 100% rename from frontend/rust-lib/lib-sqlite/src/pragma.rs rename to shared-lib/lib-sqlite/src/pragma.rs