Fixing tokio dependency breaking change

BP-WG · Dec 2, 2020 · 4a9217e · 4a9217e
1 parent 064b2f5
commit 4a9217e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 68 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ crate-type = ["dylib", "rlib", "staticlib"]
 # -----------------------------------------
 amplify = { version = "~2.3.1", features = ["stringly_conversions"] }
 amplify_derive = "~2.3.0"
-lnpbp_derive = "~0.2.0-beta.3"
+lnpbp_derive = { path = "derive" }
 # Dependencies on core rust-bitcoin ecosystem projects
 # ----------------------------------------------------
 bitcoin = { version = "~0.25.1", features = ["rand"] }
@@ -91,7 +91,9 @@ torut = { version = "~0.1.6", features = ["v2", "v3"] }
 
 [target.'cfg(target_os="android")'.dependencies]
 cc = { version = "=1.0.41" }
-socket2 = { version = "=0.3.15" }
+# TODO: Find a soliton to a problem with breaking change in one of tokio
+#       dependencies
+# socket2 = { version = "=0.3.15" }
 zmq = { version = "~0.9", features = ["vendored"] }
 
 [target.'cfg(target_os="ios")'.dependencies]

diff --git a/services/Cargo.toml b/services/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2018"
 # LNP/BP libraries
 amplify = "~2.3.1"
 amplify_derive = "~2.3.0"
-lnpbp = "~0.2.0-beta.3"
-lnpbp_derive = "~0.2.0-beta.3"
+lnpbp = { path = ".." }
+lnpbp_derive = { path = "../derive" }
 # Serialization & parsing
 serde_crate = { package = "serde", version = "~1.0.106", features = ["derive"], optional = true }
 serde_with = { version = "~1.5.1", optional = true, features = ["hex"] }