github-mirrors/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2025-04-24 14:47:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

ci: fix compile errors

Browse source
This commit is contained in:
appflowy 2022-02-07 16:04:35 +08:00
commit 59aed762e7
9 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/rust-lib/Cargo.lock generated
View file

@ -830,7 +830,7 @@ dependencies = [
"flowy-collaboration", "flowy-collaboration",
"flowy-database", "flowy-database",
"flowy-derive", "flowy-derive",
"http-response", "http-flowy",
"lib-dispatch", "lib-dispatch",
"lib-ot", "lib-ot",
"lib-sqlite", "lib-sqlite",
@ -918,7 +918,7 @@ dependencies = [
"flowy-user", "flowy-user",
"flowy-user-data-model", "flowy-user-data-model",
"futures-util", "futures-util",
"http-response", "http-flowy",
"hyper", "hyper",
"lazy_static", "lazy_static",
"lib-dispatch", "lib-dispatch",
@ -1317,9 +1317,9 @@ dependencies = [
] ]
[[package]] [[package]]
name = "http-response" name = "http-flowy"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Server#0f3b0623506b3bc5855473eeb823e21ead2316a8" source = "git+https://github.com/AppFlowy-IO/AppFlowy-Server#3012acce300024dda8819d8507c9105af84cd909"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",

4
frontend/rust-lib/flowy-error/Cargo.toml
View file

@ -16,7 +16,7 @@ bytes = "1.0"
flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration", optional = true} flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration", optional = true}
lib-ot = { path = "../../../shared-lib/lib-ot", optional = true} lib-ot = { path = "../../../shared-lib/lib-ot", optional = true}
serde_json = {version = "1.0", optional = true} serde_json = {version = "1.0", optional = true}
http-response = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", optional = true} http-flowy = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", optional = true}
flowy-database = { path = "../flowy-database", optional = true} flowy-database = { path = "../flowy-database", optional = true}
r2d2 = { version = "0.8", optional = true} r2d2 = { version = "0.8", optional = true}
lib-sqlite = { path = "../lib-sqlite", optional = true } lib-sqlite = { path = "../lib-sqlite", optional = true }
@ -25,5 +25,5 @@ lib-sqlite = { path = "../lib-sqlite", optional = true }
collaboration = ["flowy-collaboration"] collaboration = ["flowy-collaboration"]
ot = ["lib-ot"] ot = ["lib-ot"]
serde = ["serde_json"] serde = ["serde_json"]
http_server = ["http-response"] http_server = ["http-flowy"]
db = ["flowy-database", "lib-sqlite", "r2d2"] db = ["flowy-database", "lib-sqlite", "r2d2"]

2
frontend/rust-lib/flowy-error/src/ext/http_server.rs
View file

@ -1,6 +1,6 @@
use crate::FlowyError; use crate::FlowyError;
use error_code::ErrorCode; use error_code::ErrorCode;
use http_response::errors::{ErrorCode as ServerErrorCode, ServerError}; use http_flowy::errors::{ErrorCode as ServerErrorCode, ServerError};
impl std::convert::From<ServerError> for FlowyError { impl std::convert::From<ServerError> for FlowyError {
fn from(error: ServerError) -> Self { fn from(error: ServerError) -> Self {

2
frontend/rust-lib/flowy-net/Cargo.toml
View file

@ -29,7 +29,7 @@ tracing = { version = "0.1", features = ["log"] }
dashmap = {version = "4.0"} dashmap = {version = "4.0"}
async-stream = "0.3.2" async-stream = "0.3.2"
futures-util = "0.3.15" futures-util = "0.3.15"
http-response = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", features = ["with_reqwest"]} http-flowy = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", features = ["with_reqwest"] }
serde-aux = "1.0.1" serde-aux = "1.0.1"
reqwest = "0.11" reqwest = "0.11"
hyper = "0.14" hyper = "0.14"

2
frontend/rust-lib/flowy-net/src/http_server/document.rs
View file

@ -5,7 +5,7 @@ use crate::{
use flowy_collaboration::entities::document_info::{CreateDocParams, DocumentId, DocumentInfo, ResetDocumentParams}; use flowy_collaboration::entities::document_info::{CreateDocParams, DocumentId, DocumentInfo, ResetDocumentParams};
use flowy_document::DocumentCloudService; use flowy_document::DocumentCloudService;
use flowy_error::FlowyError; use flowy_error::FlowyError;
use http_response::response::FlowyResponse; use http_flowy::response::FlowyResponse;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use lib_infra::future::FutureResult; use lib_infra::future::FutureResult;
use std::sync::Arc; use std::sync::Arc;

4
frontend/rust-lib/flowy-net/src/http_server/folder.rs
View file

@ -11,8 +11,8 @@ use flowy_folder_data_model::entities::{
}; };
use flowy_folder::event_map::FolderCouldServiceV1; use flowy_folder::event_map::FolderCouldServiceV1;
use http_response::errors::ServerError; use http_flowy::errors::ServerError;
use http_response::response::FlowyResponse; use http_flowy::response::FlowyResponse;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use lib_infra::future::FutureResult; use lib_infra::future::FutureResult;
use std::sync::Arc; use std::sync::Arc;

2
frontend/rust-lib/flowy-net/src/http_server/user.rs
View file

@ -4,7 +4,7 @@ use flowy_user::event_map::UserCloudService;
use flowy_user_data_model::entities::{ use flowy_user_data_model::entities::{
SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile, SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile,
}; };
use http_response::errors::ServerError; use http_flowy::errors::ServerError;
use lib_infra::future::FutureResult; use lib_infra::future::FutureResult;
pub struct UserHttpCloudService { pub struct UserHttpCloudService {

4
frontend/rust-lib/flowy-net/src/request.rs
View file

@ -1,7 +1,7 @@
use crate::configuration::HEADER_TOKEN; use crate::configuration::HEADER_TOKEN;
use bytes::Bytes; use bytes::Bytes;
use http_response::errors::ServerError; use http_flowy::errors::ServerError;
use http_response::response::FlowyResponse; use http_flowy::response::FlowyResponse;
use hyper::http; use hyper::http;
use protobuf::ProtobufError; use protobuf::ProtobufError;
use reqwest::{header::HeaderMap, Client, Method, Response}; use reqwest::{header::HeaderMap, Client, Method, Response};

1
frontend/scripts/makefile/desktop.toml
View file

@ -34,6 +34,7 @@ private = true
script = [ script = [
""" """
cd rust-lib/ cd rust-lib/
rustup show
echo cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}" echo cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}" cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
cd ../ cd ../