From f7415c6d89030314bf718a3fa549b7c8c935a518 Mon Sep 17 00:00:00 2001 From: Abhishek Batra Date: Thu, 10 Oct 2019 15:34:36 +0530 Subject: [PATCH 1/3] fix: throw failure callback on relaunch of SDK --- Demo/Podfile.lock | 12 ++++++------ Demo/VWO Demo.xcodeproj/project.pbxproj | 4 ++-- VWO.podspec | 2 +- VWO.xcodeproj/project.pbxproj | 5 ++++- VWO/VWOController.m | 5 +++++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 09dced97..9ec26c3d 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -4,9 +4,9 @@ PODS: - Socket.IO-Client-Swift (13.3.0): - Starscream (~> 3.0.2) - Starscream (3.0.5) - - VWO (2.4.2): - - VWO/All (= 2.4.2) - - VWO/All (2.4.2): + - VWO (2.5.1): + - VWO/All (= 2.5.1) + - VWO/All (2.5.1): - Socket.IO-Client-Swift (~> 13.1) DEPENDENCIES: @@ -15,7 +15,7 @@ DEPENDENCIES: - VWO (from `../`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - MBProgressHUD - SCLAlertView - Socket.IO-Client-Swift @@ -30,8 +30,8 @@ SPEC CHECKSUMS: SCLAlertView: 6a77bb2edfc65e04dbe57725546cb4107a506b85 Socket.IO-Client-Swift: 0afb192a562db90d50e3f7f7421c06925a3f0179 Starscream: faf918b2f2eff7d5dd21180646bf015a669673bd - VWO: 6508b8083e35479212f2444b77782324ad333957 + VWO: 73f3fe52b839f74f17c1260b3175d69f91898dd7 PODFILE CHECKSUM: 132ef71ef05014159c35355b317739088f66af35 -COCOAPODS: 1.5.3 +COCOAPODS: 1.8.3 diff --git a/Demo/VWO Demo.xcodeproj/project.pbxproj b/Demo/VWO Demo.xcodeproj/project.pbxproj index 14e84627..87060de7 100644 --- a/Demo/VWO Demo.xcodeproj/project.pbxproj +++ b/Demo/VWO Demo.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-VWO Demo/Pods-VWO Demo-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-VWO Demo/Pods-VWO Demo-frameworks.sh", "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", "${BUILT_PRODUCTS_DIR}/SCLAlertView/SCLAlertView.framework", "${BUILT_PRODUCTS_DIR}/Socket.IO-Client-Swift/SocketIO.framework", @@ -318,7 +318,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VWO Demo/Pods-VWO Demo-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VWO Demo/Pods-VWO Demo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 878FD425F301D14D2EB57176 /* [CP] Check Pods Manifest.lock */ = { diff --git a/VWO.podspec b/VWO.podspec index f0b89440..0d07f953 100644 --- a/VWO.podspec +++ b/VWO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "VWO" - s.version = "2.5.0" + s.version = "2.5.1" s.summary = "VWO SDK for A/B Testing iOS apps." s.description = "VWO iOS SDK enables you to A/B test mobile apps." s.documentation_url = "http://developers.vwo.com/reference#ios-sdk-reference" diff --git a/VWO.xcodeproj/project.pbxproj b/VWO.xcodeproj/project.pbxproj index 417af31a..44cec2eb 100644 --- a/VWO.xcodeproj/project.pbxproj +++ b/VWO.xcodeproj/project.pbxproj @@ -581,7 +581,7 @@ E39814CD1F6288C80035D519 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = vwo; TargetAttributes = { E39814D51F6288C80035D519 = { @@ -602,6 +602,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = E39814CC1F6288C80035D519; @@ -739,6 +740,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -799,6 +801,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; diff --git a/VWO/VWOController.m b/VWO/VWOController.m index 74a281f3..ff1837fa 100644 --- a/VWO/VWOController.m +++ b/VWO/VWOController.m @@ -79,6 +79,11 @@ - (void)launchWithAPIKey:(NSString *)apiKey if (_initialised) { VWOLogWarning(@"VWO must not be initialised more than once"); + if (failureBlock) { + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + failureBlock(@"VWO must not be initialised more than once"); + }); + } return; } From d01a0cee15615e4df68c4768966cc82373c81faf Mon Sep 17 00:00:00 2001 From: Abhishek Batra Date: Thu, 10 Oct 2019 15:37:27 +0530 Subject: [PATCH 2/3] Increment version number in VWO/VWOController.h --- VWO/VWOController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VWO/VWOController.h b/VWO/VWOController.h index 389d7c2d..4fc37bc4 100644 --- a/VWO/VWOController.h +++ b/VWO/VWOController.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN -static NSString *kVWOSDKversion = @"2.5.0"; +static NSString *kVWOSDKversion = @"2.5.1"; @class VWOConfig; From 37748c5ff43bf723a02ec790ef0debaccb990351 Mon Sep 17 00:00:00 2001 From: Abhishek Batra Date: Fri, 11 Oct 2019 12:35:00 +0530 Subject: [PATCH 3/3] Updated verion in VWOUURL.m --- VWO/VWOURL.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VWO/VWOURL.m b/VWO/VWOURL.m index 38ec145c..32b59904 100644 --- a/VWO/VWOURL.m +++ b/VWO/VWOURL.m @@ -26,7 +26,7 @@ + (instancetype)vwoComponentForPath:(NSString *)path { } @end -static NSString *kSDKversionNumber = @"13"; +static NSString *kSDKversionNumber = @"14"; @interface VWOURL()