Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick our Neon fork to a new 0.5.2 build #310

Merged
merged 2 commits into from
May 20, 2021
Merged

Cherry-pick our Neon fork to a new 0.5.2 build #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f968f22
Merge pull request #308 from signalapp/jrose/use-neon-fork
jrose-signal May 20, 2021
2de6a30
Bump version to 0.5.2
jrose-signal May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
2 changes: 1 addition & 1 deletion SignalClient.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion rust/bridge/ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust/bridge/jni/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions rust/bridge/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion rust/bridge/shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down