Skip to content

Commit fc5fb42

Browse files
authored
Merge pull request #202 from matrix-org/kegan/uniffi-0.28
Bump to uniffi 0.28.3
2 parents 2739702 + ce24129 commit fc5fb42

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

install_uniffi_bindgen_go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash -e
22
set -o pipefail
33

4-
cargo install uniffi-bindgen-go --tag v0.2.2+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-go
4+
cargo install uniffi-bindgen-go --tag v0.4.0+v0.28.3 --git https://github.com/kegsay/uniffi-bindgen-go

internal/api/rust/session_delegate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func NewMemoryClientSessionDelegate() *MemoryClientSessionDelegate {
1212
}
1313
}
1414

15-
func (d *MemoryClientSessionDelegate) RetrieveSessionFromKeychain(userID string) (matrix_sdk_ffi.Session, *matrix_sdk_ffi.ClientError) {
15+
func (d *MemoryClientSessionDelegate) RetrieveSessionFromKeychain(userID string) (matrix_sdk_ffi.Session, error) {
1616
s, exists := d.userIDToSession[userID]
1717
if !exists {
1818
return matrix_sdk_ffi.Session{}, matrix_sdk_ffi.NewClientErrorGeneric("Failed to find RestorationToken in the Keychain.", nil)

rebuild_rust_sdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ cd $RUST_SDK_DIR;
4545
cp Cargo.toml Cargo.toml.backup
4646
cp Cargo.lock Cargo.lock.backup
4747
trap "mv $RUST_SDK_DIR/Cargo.toml.backup $RUST_SDK_DIR/Cargo.toml; mv $RUST_SDK_DIR/Cargo.lock.backup $RUST_SDK_DIR/Cargo.lock" EXIT INT TERM
48-
sed -i.bak 's/uniffi =.*/uniffi = "0\.25\.3"/' Cargo.toml
49-
sed -i.bak 's^uniffi_bindgen =.*^uniffi_bindgen = { git = "https:\/\/github.com\/mozilla\/uniffi-rs", rev = "0a03b713306d6ce3de033157fc2ce92a238c2e24" }^' Cargo.toml
48+
sed -i.bak 's/uniffi =.*/uniffi = "0\.28\.3"/' Cargo.toml
49+
sed -i.bak 's^uniffi_bindgen =.*^uniffi_bindgen = { git = "https:\/\/github.com\/mozilla\/uniffi-rs", rev = "f7a0ba703b4c06fff8fffa98078f2e5d7588a695" }^' Cargo.toml
5050
sed -i.bak 's#matrix-sdk-crypto = {#matrix-sdk-crypto = {features = ["_disable-minimum-rotation-period-ms"],#' Cargo.toml
5151
cargo build -p matrix-sdk-ffi --features 'native-tls,sentry'
5252
# generate the bindings

0 commit comments

Comments
 (0)