From 4b85ef616c826248dfc6fb659e1f2955a5badd16 Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Fri, 13 Nov 2015 19:10:54 -0800 Subject: [PATCH 1/7] Bump deployment target to 7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit C’mon man it’s 2015. --- venmo-sdk.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/venmo-sdk.xcodeproj/project.pbxproj b/venmo-sdk.xcodeproj/project.pbxproj index db37a54..5381f0f 100644 --- a/venmo-sdk.xcodeproj/project.pbxproj +++ b/venmo-sdk.xcodeproj/project.pbxproj @@ -771,7 +771,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; PUBLIC_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers"; SDKROOT = iphoneos; @@ -805,7 +805,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; PUBLIC_HEADERS_FOLDER_PATH = "$(PROJECT_NAME)Headers"; SDKROOT = iphoneos; STRIP_STYLE = "non-global"; From b7e507c3185daa853a06c371e35cc0f5d66cfdba Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Fri, 13 Nov 2015 19:11:08 -0800 Subject: [PATCH 2/7] Fix linker errors in test targets --- Podfile | 10 ++++---- Podfile.lock | 13 ++++++---- venmo-sdk.xcodeproj/project.pbxproj | 40 ++++++++--------------------- 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/Podfile b/Podfile index 0ca44b9..de50779 100644 --- a/Podfile +++ b/Podfile @@ -1,17 +1,17 @@ platform :ios, '7.0' -target 'venmo-sdk', :exclusive => true do - podspec -end +pod 'VENCore', '~> 3.1' +pod 'CMDQueryStringSerialization', '~> 0.2' +pod 'SSKeychain', '~> 1.2' -target 'venmo-sdk-specs', :exclusive => true do +target 'venmo-sdk-specs' do pod 'Specta' pod 'Expecta' pod 'OCMock', '~> 2.2.4' pod 'Nocilla' end -target 'venmo-sdk-integration-specs', :exclusive => true do +target 'venmo-sdk-integration-specs' do pod 'Specta' pod 'Expecta' pod 'OCMock', '~> 2.2.4' diff --git a/Podfile.lock b/Podfile.lock index f8f895c..187a214 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,12 +1,14 @@ PODS: - - CMDQueryStringSerialization (0.2.0) + - CMDQueryStringSerialization (0.4.1): + - ISO8601 - Expecta (1.0.5) + - ISO8601 (0.3.0) - Nocilla (0.10.0) - OCMock (2.2.4) - Specta (1.0.5) - SSKeychain (1.2.3) - - VENCore (3.1.1): - - CMDQueryStringSerialization (~> 0.2.0) + - VENCore (3.1.2): + - CMDQueryStringSerialization (~> 0.3) DEPENDENCIES: - CMDQueryStringSerialization (~> 0.2) @@ -18,12 +20,13 @@ DEPENDENCIES: - VENCore (~> 3.1) SPEC CHECKSUMS: - CMDQueryStringSerialization: 15f9004212bbc72533bb533f63df79d90a00a7d8 + CMDQueryStringSerialization: 4bb0a2f5e7d8d8678d911d88072274952cbef4e5 Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe + ISO8601: 8d8a22d5edf0554a1cf75bac028c76c1dc0ffaef Nocilla: ae0a2b05f3087b473624ac2b25903695df51246a OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2 Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2 SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d - VENCore: fb44651f466971a2f3585b7e4e5a13c1641da9bf + VENCore: acdf1ebae9bb25d3b2657575fee41cabe92e9084 COCOAPODS: 0.39.0 diff --git a/venmo-sdk.xcodeproj/project.pbxproj b/venmo-sdk.xcodeproj/project.pbxproj index 5381f0f..8bf1ef1 100644 --- a/venmo-sdk.xcodeproj/project.pbxproj +++ b/venmo-sdk.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 2D5EF56017EF41B100DDD15A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2D5EF55E17EF41B100DDD15A /* InfoPlist.strings */; }; 2D5EF5B517EF450E00DDD15A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D5EF5B417EF450E00DDD15A /* UIKit.framework */; }; 8CDB74454ECE0417376DD13F /* libPods-venmo-sdk-specs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7578CAB8301D958A4865DE2C /* libPods-venmo-sdk-specs.a */; }; + ACB88555C2E24198A3103350 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A48D17DE8BBBBC10B0EDDFAC /* libPods.a */; }; B611893A18A188AE0041AF50 /* VENPermissionConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = B611893918A188AE0041AF50 /* VENPermissionConstants.h */; }; B62D59BC18973D71001E46A4 /* VENURLProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = B62D59BA18973D71001E46A4 /* VENURLProtocol.h */; }; B62D59BD18973D71001E46A4 /* VENURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = B62D59BB18973D71001E46A4 /* VENURLProtocol.m */; }; @@ -61,7 +62,6 @@ EBDCA6DE1911859900FDD5ED /* NSURL+VenmoSDKSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDCA6DD1911859900FDD5ED /* NSURL+VenmoSDKSpec.m */; }; EBEAB6A6190ACA4700BA6322 /* VENTransaction+VenmoSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEAB6A4190ACA4700BA6322 /* VENTransaction+VenmoSDK.h */; }; EBEAB6A7190ACA4700BA6322 /* VENTransaction+VenmoSDK.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEAB6A5190ACA4700BA6322 /* VENTransaction+VenmoSDK.m */; }; - F923E1C348BA23BACE44FEE8 /* libPods-venmo-sdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E1FD3900EA56C88B51F432DA /* libPods-venmo-sdk.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -96,6 +96,7 @@ /* Begin PBXFileReference section */ 004E0D6601AEFA312FA7AA90 /* libPods-venmo-sdk-integration-specs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-venmo-sdk-integration-specs.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F541F07630885E214F52E29 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 2D5EF54217EF41B100DDD15A /* libvenmo-sdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libvenmo-sdk.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D5EF54517EF41B100DDD15A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 2D5EF55217EF41B100DDD15A /* venmo-sdk-specs.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "venmo-sdk-specs.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -106,9 +107,9 @@ 510F0726432616D68E29CCC9 /* Pods-venmo-sdk-specs.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk-specs.debug.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk-specs/Pods-venmo-sdk-specs.debug.xcconfig"; sourceTree = ""; }; 7578CAB8301D958A4865DE2C /* libPods-venmo-sdk-specs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-venmo-sdk-specs.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7BCC0CEBE52DEBF579DA9CF2 /* Pods-venmo-sdk-integration-specs.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk-integration-specs.release.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk-integration-specs/Pods-venmo-sdk-integration-specs.release.xcconfig"; sourceTree = ""; }; - 80403341DEEB22E806492C83 /* Pods-venmo-sdk.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk.release.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk/Pods-venmo-sdk.release.xcconfig"; sourceTree = ""; }; 99A71299EF58438D03B3F658 /* Pods-venmo-sdk-specs.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk-specs.release.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk-specs/Pods-venmo-sdk-specs.release.xcconfig"; sourceTree = ""; }; A0948B522131ACFFAE112FE0 /* Pods-venmo-sdk-integration-specs.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk-integration-specs.debug.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk-integration-specs/Pods-venmo-sdk-integration-specs.debug.xcconfig"; sourceTree = ""; }; + A48D17DE8BBBBC10B0EDDFAC /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; B611893918A188AE0041AF50 /* VENPermissionConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VENPermissionConstants.h; sourceTree = ""; }; B611893B18A189800041AF50 /* VENSessionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VENSessionSpec.m; sourceTree = ""; }; B62D59BA18973D71001E46A4 /* VENURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VENURLProtocol.h; sourceTree = ""; }; @@ -146,6 +147,7 @@ B6F5045F18E38C2600BDACF7 /* VENPermission.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VENPermission.m; sourceTree = ""; }; B6F5046018E38C2600BDACF7 /* VENSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VENSession.h; sourceTree = ""; }; B6F5046118E38C2600BDACF7 /* VENSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VENSession.m; sourceTree = ""; }; + E1C69F8E02FED6E217B5CD1B /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; E1FD3900EA56C88B51F432DA /* libPods-venmo-sdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-venmo-sdk.a"; sourceTree = BUILT_PRODUCTS_DIR; }; EB3499BB190AF91500C74EAA /* venmo-sdk-specs-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "venmo-sdk-specs-Prefix.pch"; path = "Supporting Files/venmo-sdk-specs-Prefix.pch"; sourceTree = ""; }; EB49E22A19266E0D008EA5DC /* venmo-sdk-integration-specs.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "venmo-sdk-integration-specs.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -160,7 +162,6 @@ EBDCA6DD1911859900FDD5ED /* NSURL+VenmoSDKSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+VenmoSDKSpec.m"; sourceTree = ""; }; EBEAB6A4190ACA4700BA6322 /* VENTransaction+VenmoSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "VENTransaction+VenmoSDK.h"; sourceTree = ""; }; EBEAB6A5190ACA4700BA6322 /* VENTransaction+VenmoSDK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "VENTransaction+VenmoSDK.m"; sourceTree = ""; }; - F460659BE23E73705D09579F /* Pods-venmo-sdk.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-venmo-sdk.debug.xcconfig"; path = "Pods/Target Support Files/Pods-venmo-sdk/Pods-venmo-sdk.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -170,7 +171,7 @@ files = ( 2D5EF5B517EF450E00DDD15A /* UIKit.framework in Frameworks */, 2D5EF54617EF41B100DDD15A /* Foundation.framework in Frameworks */, - F923E1C348BA23BACE44FEE8 /* libPods-venmo-sdk.a in Frameworks */, + ACB88555C2E24198A3103350 /* libPods.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -228,6 +229,7 @@ E1FD3900EA56C88B51F432DA /* libPods-venmo-sdk.a */, 004E0D6601AEFA312FA7AA90 /* libPods-venmo-sdk-integration-specs.a */, 7578CAB8301D958A4865DE2C /* libPods-venmo-sdk-specs.a */, + A48D17DE8BBBBC10B0EDDFAC /* libPods.a */, ); name = Frameworks; sourceTree = ""; @@ -283,12 +285,12 @@ 4F8256C164D23617F3D41F33 /* Pods */ = { isa = PBXGroup; children = ( - F460659BE23E73705D09579F /* Pods-venmo-sdk.debug.xcconfig */, - 80403341DEEB22E806492C83 /* Pods-venmo-sdk.release.xcconfig */, A0948B522131ACFFAE112FE0 /* Pods-venmo-sdk-integration-specs.debug.xcconfig */, 7BCC0CEBE52DEBF579DA9CF2 /* Pods-venmo-sdk-integration-specs.release.xcconfig */, 510F0726432616D68E29CCC9 /* Pods-venmo-sdk-specs.debug.xcconfig */, 99A71299EF58438D03B3F658 /* Pods-venmo-sdk-specs.release.xcconfig */, + E1C69F8E02FED6E217B5CD1B /* Pods.debug.xcconfig */, + 0F541F07630885E214F52E29 /* Pods.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -636,7 +638,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-venmo-sdk/Pods-venmo-sdk-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; showEnvVarsInLog = 0; }; ECAF0525302A9E8858DFC2D0 /* Copy Pods Resources */ = { @@ -815,7 +817,7 @@ }; 2D5EF56617EF41B100DDD15A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F460659BE23E73705D09579F /* Pods-venmo-sdk.debug.xcconfig */; + baseConfigurationReference = E1C69F8E02FED6E217B5CD1B /* Pods.debug.xcconfig */; buildSettings = { DSTROOT = /tmp/Venmo.dst; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -834,7 +836,7 @@ }; 2D5EF56717EF41B100DDD15A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 80403341DEEB22E806492C83 /* Pods-venmo-sdk.release.xcconfig */; + baseConfigurationReference = 0F541F07630885E214F52E29 /* Pods.release.xcconfig */; buildSettings = { DSTROOT = /tmp/Venmo.dst; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -855,11 +857,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 510F0726432616D68E29CCC9 /* Pods-venmo-sdk-specs.debug.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -876,11 +873,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 99A71299EF58438D03B3F658 /* Pods-venmo-sdk-specs.release.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Prefix.pch"; INFOPLIST_FILE = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist"; @@ -893,11 +885,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = A0948B522131ACFFAE112FE0 /* Pods-venmo-sdk-integration-specs.debug.xcconfig */; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "venmo-sdk-integration-specs/venmo-sdk-integration-specs-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -917,11 +904,6 @@ baseConfigurationReference = 7BCC0CEBE52DEBF579DA9CF2 /* Pods-venmo-sdk-integration-specs.release.xcconfig */; buildSettings = { COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "venmo-sdk-integration-specs/venmo-sdk-integration-specs-Prefix.pch"; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; From 51590250dd29c2e07beaf91a08426e79dd9f3bbb Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Fri, 13 Nov 2015 19:11:30 -0800 Subject: [PATCH 3/7] Update to recommended project settings --- .../venmo-sdk-integration-specs-Info.plist | 2 +- .../venmo-sdk-specs-Info.plist | 2 +- venmo-sdk.xcodeproj/project.pbxproj | 7 +++++- .../xcschemes/venmo-sdk-ci.xcscheme | 22 ++++++++++++++----- .../xcshareddata/xcschemes/venmo-sdk.xcscheme | 22 ++++++++++++++----- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist b/venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist index 3c4e571..169b6f7 100644 --- a/venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist +++ b/venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.venmo.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist b/venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist index 2b5624d..169b6f7 100644 --- a/venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist +++ b/venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.venmo.venmo-sdk.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/venmo-sdk.xcodeproj/project.pbxproj b/venmo-sdk.xcodeproj/project.pbxproj index 8bf1ef1..de3db41 100644 --- a/venmo-sdk.xcodeproj/project.pbxproj +++ b/venmo-sdk.xcodeproj/project.pbxproj @@ -476,7 +476,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = VDK; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0710; ORGANIZATIONNAME = Venmo; TargetAttributes = { EB49E22919266E0D008EA5DC = { @@ -759,6 +759,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -864,6 +865,7 @@ "$(inherited)", ); INFOPLIST_FILE = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.venmo.venmo-sdk.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "venmo-sdk-specs"; WRAPPER_EXTENSION = xctest; }; @@ -876,6 +878,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Prefix.pch"; INFOPLIST_FILE = "venmo-sdk-specs/Supporting Files/venmo-sdk-specs-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.venmo.venmo-sdk.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "venmo-sdk-specs"; WRAPPER_EXTENSION = xctest; }; @@ -894,6 +897,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.venmo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; @@ -909,6 +913,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "venmo-sdk-integration-specs/venmo-sdk-integration-specs-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.venmo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; diff --git a/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme b/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme index 2eb6e67..6660b00 100644 --- a/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme +++ b/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -39,24 +39,36 @@ + + + + + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -49,24 +49,36 @@ + + + + + + Date: Fri, 13 Nov 2015 19:19:19 -0800 Subject: [PATCH 4/7] Update transaction parsing specs to match new response format --- venmo-sdk-specs/VENTransaction+VenmoSDKSpec.m | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/venmo-sdk-specs/VENTransaction+VenmoSDKSpec.m b/venmo-sdk-specs/VENTransaction+VenmoSDKSpec.m index 238ac32..6fdc4e8 100644 --- a/venmo-sdk-specs/VENTransaction+VenmoSDKSpec.m +++ b/venmo-sdk-specs/VENTransaction+VenmoSDKSpec.m @@ -16,13 +16,22 @@ + (instancetype)transactionWithSignedRequestDictionary:(NSDictionary *)dictionar NSDictionary *paymentsDictionary = @{ - @"payment_id": @"1234", - @"verb": @"pay", + @"id": @"1234", + @"action": @"pay", @"actor_user_id": @"1", @"target_user_id": @"2", @"amount": @"1.00", @"note": @"Have a drink on me!", - @"success": @(1) + @"success": @(1), + @"actor": @{ + @"id": @"1", + }, + @"target": @{ + @"type": @"user", + @"user": @{ + @"id": @"2" + } + } }; it(@"should initialize with a payment dictionary.", ^{ From 0466faab2df439297dcf0b8a7df46343d5934f61 Mon Sep 17 00:00:00 2001 From: Eli Perkins Date: Fri, 13 Nov 2015 11:32:21 -0500 Subject: [PATCH 5/7] Update to latest Travis box --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc0ec3f..75ccd0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ +osx_image: xcode7.1 language: objective-c -before_install: -- gem i cocoapods --no-ri --no-rdoc -- brew uninstall xctool; brew install xctool --HEAD; xcode_workspace: venmo-sdk.xcworkspace xcode_scheme: venmo-sdk-ci xcode_sdk: iphonesimulator From 10a7c8e646d8211133816af2d7b11542af90e9d4 Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Fri, 13 Nov 2015 19:31:43 -0800 Subject: [PATCH 6/7] Run integration tests on CI --- .../xcschemes/venmo-sdk-ci.xcscheme | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme b/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme index 6660b00..7be9ba1 100644 --- a/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme +++ b/venmo-sdk.xcodeproj/xcshareddata/xcschemes/venmo-sdk-ci.xcscheme @@ -38,7 +38,26 @@ ReferencedContainer = "container:venmo-sdk.xcodeproj"> + + + + + + + + @@ -70,6 +89,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + From cc35fb166d199076856e155cb782a1b8a2199d34 Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Fri, 13 Nov 2015 19:31:51 -0800 Subject: [PATCH 7/7] Remove SSKeychain dependency from podspec --- Venmo-iOS-SDK.podspec | 1 - 1 file changed, 1 deletion(-) diff --git a/Venmo-iOS-SDK.podspec b/Venmo-iOS-SDK.podspec index d6e3e19..586be67 100644 --- a/Venmo-iOS-SDK.podspec +++ b/Venmo-iOS-SDK.podspec @@ -15,6 +15,5 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/venmo/venmo-ios-sdk.git", :tag => "v#{s.version}" } s.source_files = 'venmo-sdk/**/*.{h,m}' s.dependency 'VENCore', '~> 3.1' - s.dependency 'SSKeychain', '~> 1.2' s.dependency 'CMDQueryStringSerialization', '~> 0.2' end