diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh index 0403393f..63983524 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh @@ -27,8 +27,13 @@ IFS="$bkpIFS" cd $VCX_SDK/vcx/wrappers/ios/vcx #mv lib/libvcx.a lib/libvcx.a.original cp -v lib/${COMBINED_LIB}.a lib/libvcx.a + xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug CONFIGURATION_BUILD_DIR=. clean +if [ "${COMBINED_LIB}" = "libvcxall" ]; then +xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' +fi + rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos for arch in ${archs[*]} diff --git a/vcx/wrappers/ios/vcx/vcx.framework/Info.plist b/vcx/wrappers/ios/vcx/vcx.framework/Info.plist new file mode 100644 index 00000000..a36d9f0d Binary files /dev/null and b/vcx/wrappers/ios/vcx/vcx.framework/Info.plist differ diff --git a/vcx/wrappers/ios/vcx/vcx.framework/_CodeSignature/CodeResources b/vcx/wrappers/ios/vcx/vcx.framework/_CodeSignature/CodeResources new file mode 100644 index 00000000..e60a136f --- /dev/null +++ b/vcx/wrappers/ios/vcx/vcx.framework/_CodeSignature/CodeResources @@ -0,0 +1,181 @@ + + + + + files + + Headers/ConnectMeVcx.h + + 7eDc0QmVKsCIVP0Ek/7QFMfICfo= + + Headers/libvcx.h + + 2VgFWkgV/zUP5ilbdOD+y1Epp3k= + + Headers/vcx.h + + JKXkX9CRNomxvOns+bj7iR2/5gk= + + Info.plist + + nj0zex2D1+Q4X7rzS7eIQHGfgI0= + + Modules/module.modulemap + + xgDxI7dRoRGp+H/tEl/6ympByJs= + + + files2 + + Headers/ConnectMeVcx.h + + hash + + 7eDc0QmVKsCIVP0Ek/7QFMfICfo= + + hash2 + + Kk/XQWy2PANGzMKr//LNgdFQD1J5vQHcQcCRzwWM530= + + + Headers/libvcx.h + + hash + + 2VgFWkgV/zUP5ilbdOD+y1Epp3k= + + hash2 + + o+AXuTqFZO81K96w5azo/BgvcpNPIlt7IEHb4PvxocM= + + + Headers/vcx.h + + hash + + JKXkX9CRNomxvOns+bj7iR2/5gk= + + hash2 + + K9kamsfqa0jFBMxQGXqVxAk19CjnvXR44h3LhDjBpS0= + + + Modules/module.modulemap + + hash + + xgDxI7dRoRGp+H/tEl/6ympByJs= + + hash2 + + Cezqzeou/Fbbna+jGhr5Xf6ZDnnB3gFwlEEod80Ng4Q= + + + + rules + + ^ + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^ + + weight + 20 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj b/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj index 14ea75e0..2816ebe6 100644 --- a/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj +++ b/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj @@ -738,7 +738,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "co.evernym.vcx-objc.vcx"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos11.2; + SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -779,7 +779,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "co.evernym.vcx-objc.vcx"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos11.2; + SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/vcx/wrappers/ios/vcx/vcx.xcodeproj/xcuserdata/joe.xcuserdatad/xcschemes/xcschememanagement.plist b/vcx/wrappers/ios/vcx/vcx.xcodeproj/xcuserdata/joe.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..695a5a4e --- /dev/null +++ b/vcx/wrappers/ios/vcx/vcx.xcodeproj/xcuserdata/joe.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,24 @@ + + + + + SchemeUserState + + vcx-demo.xcscheme + + orderHint + 2 + + vcx-objc.xcscheme + + orderHint + 1 + + vcx.xcscheme + + orderHint + 0 + + + + diff --git a/vcx/wrappers/ios/vcx/vcxTests.xctest/Info.plist b/vcx/wrappers/ios/vcx/vcxTests.xctest/Info.plist new file mode 100644 index 00000000..c3465d12 Binary files /dev/null and b/vcx/wrappers/ios/vcx/vcxTests.xctest/Info.plist differ diff --git a/vcx/wrappers/ios/vcx/vcxTests.xctest/_CodeSignature/CodeResources b/vcx/wrappers/ios/vcx/vcxTests.xctest/_CodeSignature/CodeResources new file mode 100644 index 00000000..8d484ff5 --- /dev/null +++ b/vcx/wrappers/ios/vcx/vcxTests.xctest/_CodeSignature/CodeResources @@ -0,0 +1,120 @@ + + + + + files + + Info.plist + + mrkkJF/A+JtPY9KE8j7ra20RiqY= + + + files2 + + rules + + ^ + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^ + + weight + 20 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/vcx/wrappers/ios/vcx/vcxTests.xctest/vcxTests b/vcx/wrappers/ios/vcx/vcxTests.xctest/vcxTests new file mode 100755 index 00000000..2976a5ba Binary files /dev/null and b/vcx/wrappers/ios/vcx/vcxTests.xctest/vcxTests differ diff --git a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m index 2ddbf33d..05a0c71f 100644 --- a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m +++ b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m @@ -29,6 +29,11 @@ - (void)testExample { // Use XCTAssert and related functions to verify your tests produce the correct results. } +- (void)testRoot { + NSString *testString = @"root vcxTest"; + XCTAssert([testString length] != 0, "ROOT TEST"); +} + - (void)testPerformanceExample { // This is an example of a performance test case. [self measureBlock:^{ diff --git a/vcx/wrappers/node/ci/test.sh b/vcx/wrappers/node/ci/test.sh index cce06fa4..85740fc8 100755 --- a/vcx/wrappers/node/ci/test.sh +++ b/vcx/wrappers/node/ci/test.sh @@ -1,6 +1,8 @@ #!/bin/bash +set -e cd vcx/wrappers/node/ npm i +npm audit npm run lint npm run compile npm test