Forráskód Böngészése

[rust]: update dart-notify crate name

appflowy 3 éve
szülő
commit
ba67652e29

+ 1 - 1
backend/Cargo.toml

@@ -99,7 +99,7 @@ parking_lot = "0.11"
 once_cell = "1.7.2"
 linkify = "0.5.0"
 backend = { path = ".", features = ["flowy_test"]}
-flowy-backend-api = { path = "../rust-lib/flowy-backend-api"}
+backend-api = { path = "../rust-lib/backend-api" }
 flowy-sdk = { path = "../rust-lib/flowy-sdk", features = ["http_server"] }
 flowy-user = { path = "../rust-lib/flowy-user", features = ["http_server"] }
 flowy-document = { path = "../rust-lib/flowy-document", features = ["flowy_test", "http_server"] }

+ 1 - 1
backend/tests/util/helper.rs

@@ -3,7 +3,7 @@ use backend::{
     config::{get_configuration, DatabaseSettings},
     context::AppContext,
 };
-use flowy_backend_api::{user_request::*, workspace_request::*};
+use backend_api::{user_request::*, workspace_request::*};
 use flowy_document::services::server::read_doc_request;
 use flowy_document_infra::entities::doc::{Doc, DocIdentifier};
 use flowy_net::errors::ServerError;

+ 1 - 1
rust-lib/Cargo.toml

@@ -20,7 +20,7 @@ members = [
   "lib-ot",
   "flowy-net",
   "lib-ws",
-  "flowy-backend-api",
+    "backend-api",
 ]
 
 exclude = ["../backend"]

+ 1 - 1
rust-lib/flowy-backend-api/Cargo.toml → rust-lib/backend-api/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "flowy-backend-api"
+name = "backend-api"
 version = "0.1.0"
 edition = "2018"
 

+ 0 - 0
rust-lib/flowy-backend-api/src/lib.rs → rust-lib/backend-api/src/lib.rs


+ 0 - 0
rust-lib/flowy-backend-api/src/middleware.rs → rust-lib/backend-api/src/middleware.rs


+ 0 - 0
rust-lib/flowy-backend-api/src/user_request.rs → rust-lib/backend-api/src/user_request.rs


+ 0 - 0
rust-lib/flowy-backend-api/src/workspace_request.rs → rust-lib/backend-api/src/workspace_request.rs


+ 2 - 2
rust-lib/dart-ffi/Cargo.toml

@@ -27,12 +27,12 @@ parking_lot = "0.11"
 lib-dispatch = {path = "../lib-dispatch" }
 flowy-sdk = {path = "../flowy-sdk"}
 flowy-derive = {path = "../flowy-derive"}
-flowy-dart-notify = {path = "../dart-notify" }
+dart-notify = {path = "../dart-notify" }
 flowy-net = {path = "../flowy-net"}
 
 
 [features]
-flutter = ["flowy-dart-notify/dart"]
+flutter = ["dart-notify/dart"]
 http_server = ["flowy-sdk/http_server", "flowy-sdk/use_bunyan"]
 #use_serde = ["bincode"]
 #use_protobuf= ["protobuf"]

+ 1 - 1
rust-lib/dart-ffi/src/lib.rs

@@ -61,7 +61,7 @@ pub extern "C" fn sync_command(input: *const u8, len: usize) -> *const u8 {
 
 #[no_mangle]
 pub extern "C" fn set_stream_port(port: i64) -> i32 {
-    flowy_dart_notify::dart::DartStreamSender::set_port(port);
+    dart_notify::dart::DartStreamSender::set_port(port);
     return 0;
 }
 

+ 1 - 1
rust-lib/dart-notify/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "flowy-dart-notify"
+name = "dart-notify"
 version = "0.1.0"
 edition = "2018"
 

+ 1 - 1
rust-lib/flowy-document/Cargo.toml

@@ -13,7 +13,7 @@ lib-dispatch = { path = "../lib-dispatch" }
 flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
 lib-infra = { path = "../lib-infra" }
-flowy-dart-notify = { path = "../dart-notify" }
+dart-notify = { path = "../dart-notify" }
 lib-ot = { path = "../lib-ot" }
 lib-ws = { path = "../lib-ws" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }

+ 1 - 1
rust-lib/flowy-document/src/notify/observable.rs

@@ -1,4 +1,4 @@
-use flowy_dart_notify::DartNotifyBuilder;
+use dart_notify::DartNotifyBuilder;
 use flowy_derive::ProtoBuf_Enum;
 const OBSERVABLE_CATEGORY: &'static str = "Doc";
 #[derive(ProtoBuf_Enum, Debug)]

+ 2 - 2
rust-lib/flowy-user/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 flowy-user-infra = { path = "../flowy-user-infra" }
-flowy-backend-api = { path = "../flowy-backend-api" }
+backend-api = { path = "../backend-api" }
 derive_more = {version = "0.99", features = ["display"]}
 lib-dispatch = { path = "../lib-dispatch" }
 flowy-derive = { path = "../flowy-derive" }
@@ -16,7 +16,7 @@ lib-sqlite = { path = "../lib-sqlite" }
 lib-infra = { path = "../lib-infra" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }
 lib-ws = { path = "../lib-ws" }
-flowy-dart-notify = { path = "../dart-notify" }
+dart-notify = { path = "../dart-notify" }
 
 tracing = { version = "0.1", features = ["log"] }
 bytes = "1.0"

+ 1 - 1
rust-lib/flowy-user/src/notify/observable.rs

@@ -1,6 +1,6 @@
 use flowy_derive::ProtoBuf_Enum;
 
-use flowy_dart_notify::DartNotifyBuilder;
+use dart_notify::DartNotifyBuilder;
 
 const OBSERVABLE_CATEGORY: &'static str = "User";
 

+ 1 - 1
rust-lib/flowy-user/src/services/server/server_api.rs

@@ -3,7 +3,7 @@ use crate::{
     errors::UserError,
     services::server::UserServerAPI,
 };
-use flowy_backend_api::user_request::*;
+use backend_api::user_request::*;
 use flowy_net::config::*;
 use lib_infra::future::ResultFuture;
 

+ 2 - 2
rust-lib/flowy-workspace/Cargo.toml

@@ -14,10 +14,10 @@ flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
 lib-sqlite = { path = "../lib-sqlite" }
 lib-infra = { path = "../lib-infra" }
-flowy-dart-notify = { path = "../dart-notify" }
+dart-notify = { path = "../dart-notify" }
 lib-ot = { path = "../lib-ot" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }
-flowy-backend-api = { path = "../flowy-backend-api"}
+backend-api = { path = "../backend-api" }
 
 parking_lot = "0.11"
 protobuf = {version = "2.18.0"}

+ 1 - 1
rust-lib/flowy-workspace/src/notify/observable.rs

@@ -1,4 +1,4 @@
-use flowy_dart_notify::DartNotifyBuilder;
+use dart_notify::DartNotifyBuilder;
 use flowy_derive::ProtoBuf_Enum;
 const OBSERVABLE_CATEGORY: &'static str = "Workspace";
 

+ 1 - 1
rust-lib/flowy-workspace/src/services/server/server_api.rs

@@ -9,7 +9,7 @@ use crate::{
     notify::{send_dart_notification, WorkspaceNotification},
     services::server::WorkspaceServerAPI,
 };
-use flowy_backend_api::{middleware::*, workspace_request::*};
+use backend_api::{middleware::*, workspace_request::*};
 use flowy_net::config::ServerConfig;
 use flowy_workspace_infra::errors::ErrorCode;
 use lib_infra::future::ResultFuture;