Merge pull request #65 from djmitche/issue63
do not require taskchampion from sync-server
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -2048,7 +2048,7 @@ dependencies = [
|
||||
"actix-web",
|
||||
"failure",
|
||||
"futures",
|
||||
"taskchampion",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -7,9 +7,9 @@ edition = "2018"
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
uuid = { version = "0.8.1", features = ["serde", "v4"] }
|
||||
actix-web = "3.3.0"
|
||||
failure = "0.1.8"
|
||||
taskchampion = { path = "../taskchampion" }
|
||||
futures = "0.3.8"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
@@ -74,7 +74,7 @@ mod test {
|
||||
use crate::app_scope;
|
||||
use crate::storage::{InMemoryStorage, Storage};
|
||||
use actix_web::{http::StatusCode, test, App};
|
||||
use taskchampion::Uuid;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_success() {
|
||||
|
||||
@@ -45,7 +45,7 @@ mod test {
|
||||
use crate::app_scope;
|
||||
use crate::storage::{InMemoryStorage, Storage};
|
||||
use actix_web::{http::StatusCode, test, App};
|
||||
use taskchampion::Uuid;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_success() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
//! invariants, and so on.
|
||||
use crate::storage::{Client, StorageTxn};
|
||||
use failure::Fallible;
|
||||
use taskchampion::Uuid;
|
||||
use uuid::Uuid;
|
||||
|
||||
/// The distinguished value for "no version"
|
||||
pub const NO_VERSION_ID: VersionId = Uuid::nil();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use failure::Fallible;
|
||||
use taskchampion::Uuid;
|
||||
use uuid::Uuid;
|
||||
|
||||
mod inmemory;
|
||||
pub(crate) use inmemory::InMemoryStorage;
|
||||
|
||||
Reference in New Issue
Block a user