From 7236e78944d57c7693228f1e087d3b7c1fd25bc4 Mon Sep 17 00:00:00 2001 From: Konrad Kohbrok Date: Wed, 23 Aug 2023 16:41:24 +0200 Subject: [PATCH] Add artificial dependency (#64) --- Cargo.toml | 12 +++--------- coreclient/dart-bridge/makefile | 6 +++--- server/Cargo.toml | 3 +++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 13100a68..2f25e956 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,16 +4,10 @@ [workspace] -members = [ - "backend", - "server", - "apiclient", - "coreclient", - "test_harness" -] +members = ["backend", "server", "apiclient", "coreclient", "test_harness"] [workspace.dependencies] -tls_codec = { version = "0.3.0-pre.4", features = ["derive", "serde", "mls"] } +tls_codec = { version = "0.3.0", features = ["derive", "serde", "mls"] } [patch.crates-io] -tls_codec = { git = 'https://github.com/RustCrypto/formats.git' } +tls_codec = { git = 'https://github.com/RustCrypto/formats.git', rev = '3e65c66f4af19f22952200e3c5da3f035efe8e7a' } diff --git a/coreclient/dart-bridge/makefile b/coreclient/dart-bridge/makefile index 1010d7cd..2edadc5c 100644 --- a/coreclient/dart-bridge/makefile +++ b/coreclient/dart-bridge/makefile @@ -33,19 +33,19 @@ setup-macos: brew install gawk make setup-flutter flutter config --enable-macos-desktop - cargo install flutter_rust_bridge_codegen + cargo install flutter_rust_bridge_codegen cargo-expand setup-linux: sudo snap install flutter --classic sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev gawk make setup-flutter flutter config --enable-linux-desktop - cargo install flutter_rust_bridge_codegen + cargo install flutter_rust_bridge_codegen cargo-expand setup-ci: flutter pub get flutter doctor - cargo install flutter_rust_bridge_codegen --force + cargo install flutter_rust_bridge_codegen cargo-expand --force setup-flutter: flutter upgrade diff --git a/server/Cargo.toml b/server/Cargo.toml index 3982448c..4d90a65a 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -53,6 +53,9 @@ reqwest = { version = "^0.11", features = [ "rustls-tls-webpki-roots", "brotli", ] } +# We're not actually using this. It's just here to fix the dependency of VOPRF +# to a working version. +derive-where = { version = "=1.2.1", features = ["zeroize-on-drop"] } [dependencies.sqlx] optional = true