From b1e8fc7e3cec5490fe2348aa8d29128423ac530a Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Tue, 18 Sep 2018 16:37:53 -0600 Subject: [PATCH 01/15] adds root unit test --- vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj | 4 ++-- vcx/wrappers/ios/vcx/vcxTests/vcxTests.m | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) 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/vcxTests/vcxTests.m b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m index 2ddbf33d..5fe8aad0 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)testRootTestWorking { + NSString *testString = @"root vcxTest"; + XCTAssert([testString length] != 0); +} + - (void)testPerformanceExample { // This is an example of a performance test case. [self measureBlock:^{ From 1598637e584a08b1657db63e1f87171bea2391b2 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Tue, 18 Sep 2018 16:54:15 -0600 Subject: [PATCH 02/15] adds ci testing --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- vcx/wrappers/ios/vcx/vcxTests/vcxTests.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..8270d762 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,7 +27,7 @@ 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 +xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug CONFIGURATION_BUILD_DIR=. clean test | xcpretty rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos diff --git a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m index 5fe8aad0..134c3d20 100644 --- a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m +++ b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m @@ -29,7 +29,7 @@ - (void)testExample { // Use XCTAssert and related functions to verify your tests produce the correct results. } -- (void)testRootTestWorking { +- (void)testRootWorks { NSString *testString = @"root vcxTest"; XCTAssert([testString length] != 0); } From 2311c1eee86fd96dc8587f05e8b74bceffc03eee Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 10:06:21 -0600 Subject: [PATCH 03/15] fixes broken script --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 3 ++- vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj | 4 ++-- vcx/wrappers/ios/vcx/vcxTests/vcxTests.m | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) 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 8270d762..28bf525c 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,7 +27,8 @@ 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 test | xcpretty + +xcodebuild test -project vcx.xcodeproj -scheme vcx -destination 'platform=iOS Simulator,name=iPhone xs,OS=12.0' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos diff --git a/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj b/vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj index 2816ebe6..14ea75e0 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 = iphoneos; + SDKROOT = iphoneos11.2; 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 = iphoneos; + SDKROOT = iphoneos11.2; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m index 134c3d20..d088bee4 100644 --- a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m +++ b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m @@ -29,7 +29,7 @@ - (void)testExample { // Use XCTAssert and related functions to verify your tests produce the correct results. } -- (void)testRootWorks { +- (void)testRoot { NSString *testString = @"root vcxTest"; XCTAssert([testString length] != 0); } From d2505892fde42805af069c5b5fd4a4379d5327df Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 10:35:08 -0600 Subject: [PATCH 04/15] fixes bad build param --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 28bf525c..fbba3198 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 @@ -28,7 +28,7 @@ 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 test -project vcx.xcodeproj -scheme vcx -destination 'platform=iOS Simulator,name=iPhone xs,OS=12.0' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcx -destination='platform:iOS Simulator, id:99428FD5-88D4-494F-81D3-AF3491792E1D, OS:11.2, name:iPhone X' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos From c7f5a8bcc14d9f5e011934b052cce8c1b07e45b9 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 11:12:17 -0600 Subject: [PATCH 05/15] Update mac.13.build.cocoapod.sh --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fbba3198..87adc6f9 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 @@ -42,7 +42,7 @@ do # This sdk supports armv7, armv7s, and arm64 IPHONE_SDK=iphoneos fi - xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug -arch ${arch} -sdk ${IPHONE_SDK} CONFIGURATION_BUILD_DIR=. build + xcodebuild -project vcx.xcodeproj -scheme vcxTests -configuration Debug -arch ${arch} -sdk ${IPHONE_SDK} CONFIGURATION_BUILD_DIR=. build if [ -d "./vcx.framework.previousbuild" ]; then lipo -create -output combined.ios.vcx vcx.framework/vcx vcx.framework.previousbuild/vcx From 0feaf914926a2ca62cdaebba9011f285e67fcf7d Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 11:13:23 -0600 Subject: [PATCH 06/15] Update mac.13.build.cocoapod.sh --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 87adc6f9..b97b84c2 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 @@ -28,7 +28,7 @@ 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 test -project vcx.xcodeproj -scheme vcx -destination='platform:iOS Simulator, id:99428FD5-88D4-494F-81D3-AF3491792E1D, OS:11.2, name:iPhone X' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination='platform:iOS Simulator, id:99428FD5-88D4-494F-81D3-AF3491792E1D, OS:11.2, name:iPhone X' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos @@ -42,7 +42,7 @@ do # This sdk supports armv7, armv7s, and arm64 IPHONE_SDK=iphoneos fi - xcodebuild -project vcx.xcodeproj -scheme vcxTests -configuration Debug -arch ${arch} -sdk ${IPHONE_SDK} CONFIGURATION_BUILD_DIR=. build + xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug -arch ${arch} -sdk ${IPHONE_SDK} CONFIGURATION_BUILD_DIR=. build if [ -d "./vcx.framework.previousbuild" ]; then lipo -create -output combined.ios.vcx vcx.framework/vcx vcx.framework.previousbuild/vcx From 11fcec71f82006c017cb1adf0476ca6ac6cf9426 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 11:47:17 -0600 Subject: [PATCH 07/15] Update mac.13.build.cocoapod.sh --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 1 + 1 file changed, 1 insertion(+) 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 b97b84c2..427dd718 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 @@ -28,6 +28,7 @@ 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 xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination='platform:iOS Simulator, id:99428FD5-88D4-494F-81D3-AF3491792E1D, OS:11.2, name:iPhone X' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild From 744365c577fc1f5cbc8e741449a3ae04beec2d14 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 11:54:06 -0600 Subject: [PATCH 08/15] updates xcodeproj --- vcx/wrappers/ios/vcx/vcx.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 1cfff4cca20c2e2f244bde1bd4de9e792a7148a4 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 11:58:20 -0600 Subject: [PATCH 09/15] Update vcxTests.m --- vcx/wrappers/ios/vcx/vcxTests/vcxTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m index d088bee4..05a0c71f 100644 --- a/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m +++ b/vcx/wrappers/ios/vcx/vcxTests/vcxTests.m @@ -31,7 +31,7 @@ - (void)testExample { - (void)testRoot { NSString *testString = @"root vcxTest"; - XCTAssert([testString length] != 0); + XCTAssert([testString length] != 0, "ROOT TEST"); } - (void)testPerformanceExample { From 204b40ef844d9d018b12423e2d51be7f170dd8d3 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 12:18:41 -0600 Subject: [PATCH 10/15] possible build fix --- .../ios/mac/mac.13.build.cocoapod.sh | 2 +- vcx/wrappers/ios/vcx/vcx.framework/Info.plist | Bin 0 -> 729 bytes .../_CodeSignature/CodeResources | 181 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 24 +++ .../ios/vcx/vcxTests.xctest/Info.plist | Bin 0 -> 739 bytes .../_CodeSignature/CodeResources | 120 ++++++++++++ vcx/wrappers/ios/vcx/vcxTests.xctest/vcxTests | Bin 0 -> 34656 bytes 7 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 vcx/wrappers/ios/vcx/vcx.framework/Info.plist create mode 100644 vcx/wrappers/ios/vcx/vcx.framework/_CodeSignature/CodeResources create mode 100644 vcx/wrappers/ios/vcx/vcx.xcodeproj/xcuserdata/joe.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 vcx/wrappers/ios/vcx/vcxTests.xctest/Info.plist create mode 100644 vcx/wrappers/ios/vcx/vcxTests.xctest/_CodeSignature/CodeResources create mode 100755 vcx/wrappers/ios/vcx/vcxTests.xctest/vcxTests 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 427dd718..f9b47a1e 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 @@ -29,7 +29,7 @@ cd $VCX_SDK/vcx/wrappers/ios/vcx cp -v lib/${COMBINED_LIB}.a lib/libvcx.a xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug CONFIGURATION_BUILD_DIR=. clean -xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination='platform:iOS Simulator, id:99428FD5-88D4-494F-81D3-AF3491792E1D, OS:11.2, name:iPhone X' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination 'platform=iOS Simulator,name=iPhone x,OS=12.0' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos 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 0000000000000000000000000000000000000000..a36d9f0d4f3b9a1feacfb5bc3acf37a470bd4a77 GIT binary patch literal 729 zcmZ8e&2G~`5Z+n-3KX(!3L%A-P=1SqWv5DdKtgJ3f%eIZo8T z3vlBBIKhz%NF2EE5+HHm0K5Sb;sLr&ZM9+#J2T(UYG$?>2;Pfy{TG=6eB|h{<0r;W zo;p2#=4^&cOlGIfozGp!=cX@Sn!Q}OGI#ab^}>yt4#_U}xoFi~+T}i5vqqIe@++0) zzTXneWCJE-;4wd1XB{qmhfJp2{ar@;k=qpP5Lj&~DQ|NYI%FnQR{gd#IgOOx4Tqa7 z?5S)gWgoeodLf&Zb(cPOJIo#i3Y|_-t1H7OaavKx{mx;s9|VeKt-5fdwhXKA + + + + 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/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 0000000000000000000000000000000000000000..c3465d12ebbdb301db58c67c4aa82fcb3313c109 GIT binary patch literal 739 zcmZ8ePgB!C6yLZ0Lq!`XiXb3@|6s;UQl|BwmzIbY1u6-M4%1A!-L@;6Y$i!NRKI{X zKY%AadeIrLd$y2A#44pl9 ze)z)0oH8<+AG>sU{K~}m;7G@|7;*%{7N~m`69vq_UNX<&{d; zYjSGP9_7M!sTXb1HWQw$jAq=!eM-8K)8Olq{+nfL4DNC$N(7lP2)+TeqmTLjfKw*Ylny?-A!Y{~R9WWQ5HsB+nX*LPKk-W82kBu*0AEUB7R zSvQ`Vx~hGcmIJU_M|jkfe~}}L;F)eKb40kR=7?rSej#B;VpcHYP1y)8t223m@++D4<|8gqBbhQS=(UL!Z$B`i6eP zFwDRL+=o@D1A`FWz*~3^pWq98g#-8whwuY_!Y}v(fAKtC#1C*8KgM-Ta0l;U7bOS7 MQACSrOam7G0H#gl7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2976a5ba41e3f75fa9c8e9a33c91f7d4d954ea26 GIT binary patch literal 34656 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 Date: Wed, 19 Sep 2018 13:42:11 -0600 Subject: [PATCH 11/15] Update mac.13.build.cocoapod.sh --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f9b47a1e..29e39275 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 @@ -29,7 +29,7 @@ cd $VCX_SDK/vcx/wrappers/ios/vcx cp -v lib/${COMBINED_LIB}.a lib/libvcx.a xcodebuild -project vcx.xcodeproj -scheme vcx -configuration Debug CONFIGURATION_BUILD_DIR=. clean -xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination 'platform=iOS Simulator,name=iPhone x,OS=12.0' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' -configuration Debug CONFIGURATION_BUILD_DIR=. clean rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos From 974c3adc11b7038917d18b19cbdb753e1e72c972 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 14:19:51 -0600 Subject: [PATCH 12/15] conditional tests added --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 3 +++ 1 file changed, 3 insertions(+) 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 29e39275..6b24e601 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 @@ -29,7 +29,10 @@ cd $VCX_SDK/vcx/wrappers/ios/vcx 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' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +fi rm -rf vcx.framework.previousbuild IPHONE_SDK=iphoneos From 81aebd464621cfd19c78bd33683a4948b294a78f Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 15:06:40 -0600 Subject: [PATCH 13/15] Update mac.13.build.cocoapod.sh --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6b24e601..f02bdfef 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 @@ -31,7 +31,7 @@ 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' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcx -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' -configuration Debug CONFIGURATION_BUILD_DIR=. clean fi rm -rf vcx.framework.previousbuild From 16192dd0ca1fd462128d1cd4788dcc5297cc9a26 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Wed, 19 Sep 2018 15:10:11 -0600 Subject: [PATCH 14/15] removes unneeded test configuration --- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f02bdfef..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 @@ -31,7 +31,7 @@ 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 vcx -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' -configuration Debug CONFIGURATION_BUILD_DIR=. clean +xcodebuild test -project vcx.xcodeproj -scheme vcxTests -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' fi rm -rf vcx.framework.previousbuild From eaa1e669dd77b0192ba18bd024f50d3f8bb35886 Mon Sep 17 00:00:00 2001 From: Joe Genereux Date: Thu, 4 Oct 2018 16:25:04 -0600 Subject: [PATCH 15/15] adds failure to npm audit --- vcx/wrappers/node/ci/test.sh | 2 ++ 1 file changed, 2 insertions(+) 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