Merge pull request #310 from signalapp/jrose/0.5.2-with-neon-fork

Cherry-pick our Neon fork to a new 0.5.2 build

Cargo.toml

@@ -17,6 +17,7 @@ default-members = [
 
 [patch.crates-io]
 curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', branch = '3.0.0-lizard2' }
+neon = { git = 'https://github.com/signalapp/neon', tag = 'signal-2021-05-19' }
 
 [profile.dev.package.num-bigint-dig]
 opt-level = 2 # too slow otherwise!

SignalClient.podspec

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SignalClient'
-  s.version          = '0.5.1'
+  s.version          = '0.5.2'
   s.summary          = 'A Swift wrapper library for communicating with the Signal messaging service.'
 
   s.homepage         = 'https://github.com/signalapp/libsignal-client'

java/build.gradle

@@ -1,5 +1,5 @@
 subprojects {
-    ext.version_number     = "0.5.1"
+    ext.version_number     = "0.5.2"
     ext.group_info         = "org.whispersystems"
 
     if (JavaVersion.current().isJava8Compatible()) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/signal-client",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "AGPL-3.0-only",
   "main": "node/dist/index.js",
   "types": "node/dist/index.d.ts",

rust/bridge/ffi/Cargo.toml

@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-ffi"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jack Lloyd <[email protected]>"]
 edition = "2018"
 license = "AGPL-3.0-only"

rust/bridge/jni/Cargo.toml

@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-jni"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jack Lloyd <[email protected]>"]
 edition = "2018"
 license = "AGPL-3.0-only"

rust/bridge/node/Cargo.toml

@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-node"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jordan Rose <[email protected]>", "Jack Lloyd <[email protected]>"]
 license = "AGPL-3.0-only"
 edition = "2018"
@@ -18,7 +18,7 @@ crate-type = ["cdylib"]
 libsignal-protocol = { path = "../../protocol" }
 libsignal-bridge = { path = "../shared", features = ["node"] }
 signal-neon-futures = { path = "futures" }
-neon = { version = "0.8", default-features = false, features = ["napi-4", "event-queue-api"] }
+neon = { version = "0.8", default-features = false, features = ["napi-6", "event-queue-api"] }
 rand = "0.7.3"
 log = "0.4"
 log-panics = { version = "2.0.0", features = ["with-backtrace"] }

rust/bridge/shared/Cargo.toml

@@ -26,7 +26,7 @@ uuid = "0.8"
 
 libc = { version = "0.2", optional = true }
 jni_crate = { version = "0.19", package = "jni", optional = true }
-neon = { version = "0.8", optional = true, default-features = false, features = ["napi-4"] }
+neon = { version = "0.8", optional = true, default-features = false, features = ["napi-6"] }
 linkme = { version = "0.2.4", optional = true }
 signal-neon-futures = { path = "../node/futures", optional = true }