Merge pull request #7 from Iterable/feature/ITBL-5301-migrate-new-changes

[ITBL-5301] - migrate new changes

Author: tapashmajumder

.gitignore

@@ -10,3 +10,4 @@ Pods/
 
 scripts/
 
+dev.config

IterableAppExtensions.podspec

@@ -85,11 +85,14 @@ Pod::Spec.new do |s|
   #  Not including the public_header_files will make all headers public.
   #
 
-  s.source_files  = "notification-extension/*.{h,m,swift}", "swift-sdk/ITBConsts.swift"
+  s.source_files  = "notification-extension/*.{h,m,swift}", "swift-sdk/ITBConsts.swift", "swift-sdk/IterableConstants.h"
   # s.exclude_files = "Classes/Exclude"
 
   # s.public_header_files = "Classes/**/*.h"
 
+  s.pod_target_xcconfig = {
+    'SWIFT_VERSION' => '4.1'
+  }
 
   # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #

IterableSDK.podspec

@@ -73,6 +73,10 @@ Pod::Spec.new do |s|
 
   s.source_files  = "swift-sdk/*.{h,m,swift}"
 
+  s.pod_target_xcconfig = {
+    'SWIFT_VERSION' => '4.1'
+  }
+
   # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
   #  A list of resources included with the Pod. These are copied into the

Podfile

@@ -1,7 +1,7 @@
 platform :ios, '8.0'
 
 target 'swift-sdk-swift-tests' do
-    pod 'OHHTTPStubs'
+    pod 'OHHTTPStubs/Swift'
 end
 
 target 'swift-sdk-objc-tests' do

notification-extension-tests/Info.plist renamed to Tests/notification-extension-tests/Info.plist

@@ -23,7 +23,7 @@ @implementation IterableAPIResponseTests
 
 - (void)setUp {
     [super setUp];
-    [IterableAPI initializeWithApiKey:@"" launchOptions:nil config: nil email:nil userId:nil];
+    [IterableAPI initializeWithApiKey:@""];
 }
 
 - (void)tearDown {
@@ -56,8 +56,8 @@ - (void)testResponseCode200 {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onSuccess is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:^(NSDictionary * _Nonnull data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:^(NSDictionary * _Nonnull data) {
         [expectation fulfill];
         XCTAssert([data isEqualToDictionary:responseData]);
     } onFailure:nil];
@@ -69,8 +69,8 @@ - (void)testResponseCode200WithNoData {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssertEqualObjects(reason, @"No data received");
     }];
@@ -82,8 +82,8 @@ - (void)testResponseCode200WithInvalidJson {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssert([reason containsString:@"Could not parse json"]);
     }];
@@ -95,8 +95,8 @@ - (void)testResponseCode400WithoutMessage {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssert([reason containsString:@"Invalid Request"]);
     }];
@@ -108,8 +108,8 @@ - (void)testResponseCode400WithMessage {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssertEqualObjects(reason, @"Test error");
     }];
@@ -121,8 +121,8 @@ - (void)testResponseCode401 {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssertEqualObjects(reason, @"Invalid API Key");
     }];
@@ -134,8 +134,8 @@ - (void)testResponseCode500 {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssertEqualObjects(reason, @"Internal Server Error");
     }];
@@ -147,8 +147,8 @@ - (void)testNon200ResponseCode {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssert([reason containsString:@"Received non-200 response"]);
     }];
@@ -165,8 +165,8 @@ - (void)testNoNetworkResponse {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSURLRequest *request = [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    NSURLRequest *request = [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssert([reason containsString:@"NSURLErrorDomain"]);
     }];
@@ -183,9 +183,9 @@ - (void)testNetworkTimeoutResponse {
 
     XCTestExpectation *expectation = [[XCTestExpectation alloc] initWithDescription:@"onFailure is called"];
 
-    NSMutableURLRequest *request = (NSMutableURLRequest *) [[IterableAPI instance] createPostRequestForAction:@"" withArgs:@{}];
+    NSMutableURLRequest *request = (NSMutableURLRequest *) [[IterableAPI sharedInstance] createPostRequestForAction:@"" withArgs:@{}];
     request.timeoutInterval = 0.01;
-    [[IterableAPI instance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
+    [[IterableAPI sharedInstance] sendRequest:request onSuccess:nil onFailure:^(NSString * _Nonnull reason, NSData * _Nullable data) {
         [expectation fulfill];
         XCTAssert([reason containsString:@"timed out"]);
     }];