diff --git a/Cargo.lock b/Cargo.lock index e4da04e..c3920de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -788,20 +788,15 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64", "bincode", "chrono", "git2", - "jsonwebtoken", - "rand", - "rsa", "secrecy", "semver", "serde", "serde_json", "sqlx", "thiserror", - "toml", "tracing", "url", ] diff --git a/giterated-core/Cargo.toml b/giterated-core/Cargo.toml index bf657e2..43fd6a7 100644 --- a/giterated-core/Cargo.toml +++ b/giterated-core/Cargo.toml @@ -9,5 +9,6 @@ edition = "2021" giterated-abi = { path = "../giterated-runtime/giterated-abi"} giterated-static-runtime = { path = "../giterated-runtime/giterated-static-runtime"} giterated-models = { path = "giterated-models" } + anyhow = "1" tracing = "0.1" diff --git a/giterated-core/giterated-models/Cargo.toml b/giterated-core/giterated-models/Cargo.toml index 0987e65..6ca9767 100644 --- a/giterated-core/giterated-models/Cargo.toml +++ b/giterated-core/giterated-models/Cargo.toml @@ -19,23 +19,13 @@ publish = false tracing = "0.1" serde = { version = "1.0", features = [ "derive" ]} serde_json = "1.0" -base64 = "0.21" -jsonwebtoken = { version = "9.1", features = ["use_pem"]} -rand = "0.8" -rsa = {version = "0.9", features = ["sha2"]} semver = {version = "1.0", features = ["serde"]} bincode = "1.3" secrecy = { version = "0.8", features = ["serde"] } thiserror = "1" anyhow = "1" -toml = { version = "0.8" } -# Git backend -git2 = "0.18" chrono = { version = "0.4", features = [ "serde" ] } async-trait = "0.1" url = {version = "2.4", features = ["serde"]} - -# Git backend -sqlx = { version = "0.7", default-features = false, features = [ "macros", "chrono" ] } - -#uuid = { version = "1.4", features = [ "v4", "serde" ] } +git2 = "0.18" +sqlx = { version = "0.7", default-features = false, features = [ "macros", "chrono" ] } \ No newline at end of file diff --git a/giterated-daemon/Cargo.toml b/giterated-daemon/Cargo.toml index 07b323d..29b6ec2 100644 --- a/giterated-daemon/Cargo.toml +++ b/giterated-daemon/Cargo.toml @@ -13,6 +13,10 @@ keywords = ["giterated"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +giterated-models = { path = "../giterated-core/giterated-models" } +giterated-plugin = { path = "../giterated-plugin" } +giterated-protocol = { path = "../plugins/giterated-protocol" } + tokio-tungstenite = "0.20" tokio = { version = "1.32", features = [ "full" ] } tracing = "0.1" @@ -29,9 +33,6 @@ reqwest = "0.11" argon2 = "0.5" aes-gcm = "0.10" semver = {version = "1.0", features = ["serde"]} -giterated-models = { path = "../giterated-core/giterated-models" } -giterated-plugin = { path = "../giterated-plugin" } -giterated-protocol = { path = "../plugins/giterated-protocol" } deadpool = "0.9" bincode = "1.3" tokio-util = {version = "0.7", features = ["rt"]} diff --git a/giterated-plugin/Cargo.toml b/giterated-plugin/Cargo.toml index 5cc83a2..c1251ea 100644 --- a/giterated-plugin/Cargo.toml +++ b/giterated-plugin/Cargo.toml @@ -6,17 +6,18 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +giterated-models = { path = "../giterated-core/giterated-models" } +giterated-static-runtime = { path = "../giterated-runtime/giterated-static-runtime" } +giterated-abi = { path = "../giterated-runtime/giterated-abi" } +giterated-macros = { path = "giterated-macros" } + dlopen2 = "0.6" anyhow = "1" thiserror = "1" tracing = "0.1" -giterated-models = { path = "../giterated-core/giterated-models" } -giterated-static-runtime = { path = "../giterated-runtime/giterated-static-runtime" } -giterated-abi = { path = "../giterated-runtime/giterated-abi" } semver = "*" serde_json = "1.0" async-trait = "0.1" serde = "*" futures-util = "0.3.30" -tokio = { version = "1.32", features = [ "full" ] } -giterated-macros = { path = "giterated-macros" } \ No newline at end of file +tokio = { version = "1.32", features = [ "full" ] } \ No newline at end of file diff --git a/giterated-runtime/Cargo.toml b/giterated-runtime/Cargo.toml index 93859a5..23b351d 100644 --- a/giterated-runtime/Cargo.toml +++ b/giterated-runtime/Cargo.toml @@ -7,7 +7,8 @@ edition = "2021" [dependencies] giterated-abi = { path = "giterated-abi" } -dlopen2 = "0.6" giterated-models = { path = "../giterated-core/giterated-models" } -tracing = "0.1" giterated-core = { path = "../giterated-core" } + +tracing = "0.1" +dlopen2 = "0.6" \ No newline at end of file diff --git a/giterated-runtime/giterated-abi/Cargo.toml b/giterated-runtime/giterated-abi/Cargo.toml index 1386af1..de43792 100644 --- a/giterated-runtime/giterated-abi/Cargo.toml +++ b/giterated-runtime/giterated-abi/Cargo.toml @@ -7,5 +7,6 @@ edition = "2021" [dependencies] giterated-models = { path = "../../giterated-core/giterated-models"} + anyhow = "1" dlopen2 = "0.6" diff --git a/plugins/example-plugin/Cargo.toml b/plugins/example-plugin/Cargo.toml index 39d367f..68462f6 100644 --- a/plugins/example-plugin/Cargo.toml +++ b/plugins/example-plugin/Cargo.toml @@ -13,9 +13,10 @@ crate-type = ["dylib"] [dependencies] giterated-plugin = { path = "../../giterated-plugin" } giterated-static-runtime = { path = "../../giterated-runtime/giterated-static-runtime" } +giterated-models = { path = "../../giterated-core/giterated-models" } + dlopen2 = "0.6" tracing-subscriber = "0.3" -giterated-models = { path = "../../giterated-core/giterated-models" } tracing = "0.1" serde_json = "1.0" anyhow = "1" diff --git a/plugins/giterated-backend/Cargo.toml b/plugins/giterated-backend/Cargo.toml index f015ea4..b195b4b 100644 --- a/plugins/giterated-backend/Cargo.toml +++ b/plugins/giterated-backend/Cargo.toml @@ -8,6 +8,7 @@ edition = "2021" [dependencies] giterated-plugin = { path = "../../giterated-plugin" } giterated-models = { path = "../../giterated-core/giterated-models" } + serde = { version = "1.0", features = [ "derive" ]} anyhow = "1" thiserror = "1" diff --git a/plugins/giterated-issues/Cargo.toml b/plugins/giterated-issues/Cargo.toml index 2f39f8c..10214cc 100644 --- a/plugins/giterated-issues/Cargo.toml +++ b/plugins/giterated-issues/Cargo.toml @@ -13,6 +13,7 @@ crate-type = ["rlib", "dylib"] [dependencies] giterated-plugin = { path = "../../giterated-plugin" } giterated-models = { path = "../../giterated-core/giterated-models" } + serde = { version = "1.0", features = [ "derive" ]} anyhow = "1" thiserror = "1" diff --git a/plugins/giterated-protocol/Cargo.toml b/plugins/giterated-protocol/Cargo.toml index 93da889..df66287 100644 --- a/plugins/giterated-protocol/Cargo.toml +++ b/plugins/giterated-protocol/Cargo.toml @@ -13,6 +13,7 @@ crate-type = ["dylib", "rlib"] [dependencies] giterated-plugin = { path = "../../giterated-plugin" } giterated-models = { path = "../../giterated-core/giterated-models" } + serde = { version = "1.0", features = [ "derive" ]} anyhow = "1" toml = { version = "0.8" } diff --git a/plugins/giterated-protocol/src/handlers.rs b/plugins/giterated-protocol/src/handlers.rs index 27f4921..63a7724 100644 --- a/plugins/giterated-protocol/src/handlers.rs +++ b/plugins/giterated-protocol/src/handlers.rs @@ -8,9 +8,7 @@ use giterated_models::{ object::GiteratedObject, operation::GiteratedOperation, }; -use giterated_plugin::{ - new_stack::handle::RuntimeHandle, AnyFailure, AnyObject, AnyOperation, AnySuccess, -}; +use giterated_plugin::abi::vtable::runtime::RuntimeHandle; use serde::{Deserialize, Serialize}; use tokio::net::TcpStream; use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};