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

Do not bind to vdrtools FFI in ios wrapper #723

Merged
merged 5 commits into from
Jan 10, 2023
Merged

Do not bind to vdrtools FFI in ios wrapper #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aa6e9e
Remove usage of vdrtools's ffi_api feature
Patrik-Stas Jan 7, 2023
330f3f5
Remove indysdk references from ios wrapper
Patrik-Stas Jan 7, 2023
30d6091
Delete links to libindy from ios wrapper
Patrik-Stas Jan 8, 2023
d1f3bec
Remove more indysdk traces from ios wrapper
Patrik-Stas Jan 8, 2023
d5eb916
Add missing #include <stdint.h>
Patrik-Stas Jan 10, 2023
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
1 change: 0 additions & 1 deletion aries_vcx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ general_test = ["test_utils", "messages/general_test" ]
fatal_warnings = []
warnlog_fetched_messages = []
mysql_test = ["test_utils" ]
ios-wrapper = ["libvdrtools/ffi_api"]
modular_dependencies = ["test_utils", "tokio/rt", "tokio/macros"]

[dependencies]
Expand Down
1 change: 0 additions & 1 deletion libvcx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ test_utils = [ "aries-vcx/test_utils" ]
pool_tests = [ "test_utils" ]
general_test = [ "test_utils" ]
fatal_warnings = []
ios-wrapper = ["aries-vcx/ios-wrapper"]
libvcx_c = []

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion wrappers/ios/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ build_libvcx() {

export OPENSSL_LIB_DIR=$WORK_DIR/libs/openssl/${ARCH}
echo "Building vcx. OPENSSL_LIB_DIR=${OPENSSL_LIB_DIR}"
cargo build --target "${TRIPLET}" --release --features ios-wrapper
cargo build --target "${TRIPLET}" --release
done
popd
}
Expand Down
3 changes: 0 additions & 3 deletions wrappers/ios/vcx/VcxAPI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
#import "VcxCallbacks.h"
#import "VcxWrapperCallbacks.h"
#import "libvcx.h"
#import "IndySdk.h"
#import "utils/IndyCallbacks.h"
#import "utils/IndySdk.h"
#import "utils/VcxLogger.h"

void checkErrorAndComplete(vcx_error_t ret, vcx_command_handle_t cmdHandle, void (^completion)()) {
Expand Down
446 changes: 0 additions & 446 deletions wrappers/ios/vcx/include/indy_crypto.h
View file
Open in desktop

This file was deleted.

1,203 changes: 0 additions & 1,203 deletions wrappers/ios/vcx/include/indy_ledger.h
View file
Open in desktop

This file was deleted.

222 changes: 0 additions & 222 deletions wrappers/ios/vcx/include/indy_mod.h
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions wrappers/ios/vcx/include/indy_types.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion wrappers/ios/vcx/include/libvcx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
extern "C" {
#endif

#import "IndySdk.h"
#import "VcxTypes.h"

/**
Expand Down
117 changes: 0 additions & 117 deletions wrappers/ios/vcx/utils/IndyCallbacks.h
View file
Open in desktop

This file was deleted.

Loading