NSOperationQueue Migration & Test Reorganization

.github/workflows/automation-trigger-test.yml

@@ -77,7 +77,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4.0.3
+        uses: actions/setup-node@v4.2.0
       - name: Build with Maven
         id: build_maven
         run: |

.github/workflows/release.yml

@@ -100,6 +100,27 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Install the Apple certificate
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate 
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
       - name: Build xcframework
         run: |
             ./scripts/prep_xcframework_noidfa.sh
@@ -110,7 +131,7 @@ jobs:
           path: |
             ./Branch_noidfa.zip
             ./checksum_noidfa.txt
-            ./Branch_noidfa_signed_xcframework
+            ./Branch_noidfa_signed_xcframework.zip
             ./checksum_noidfa_signed_xcframework.txt
 
   build-static-framework:
@@ -177,7 +198,7 @@ jobs:
           bundle config set --local path vendor
           bundle check || bundle install
       - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
       - name: Publish to CocoaPods
         run: |
           # TODO: Authenticate using repo secret

.gitignore

@@ -1,4 +1,8 @@
 # Mac
+
+.build
+.vscode
+
 .DS_Store
 .LSOverride
 

Branch-TestBed/Branch-SDK-Tests/BNCAPIServerTest.m

@@ -11,7 +11,7 @@
 #import "BNCSystemObserver.h"
 #import "BNCConfig.h"
 #import "BranchConstants.h"
-#import "Branch.h"
+@import BranchSDK;
 
 @interface BNCAPIServerTest : XCTestCase
 
@@ -450,7 +450,7 @@ - (void)testSetSafeTrackServiceURLWithUserTrackingDomain {
     XCTAssertEqualObjects(storedUrl, expectedUrl);
 
     storedUrl = [[BNCServerAPI sharedInstance] validationServiceURL];
-    expectedUrl = @"https://links.toTestDomain.com/v1/app-link-settings";
+    expectedUrl = @"https://api3.branch.io/v1/app-link-settings";
     XCTAssertEqualObjects(storedUrl, expectedUrl);
 
     [BNCServerAPI sharedInstance].useTrackingDomain = NO;
@@ -501,7 +501,7 @@ - (void)testSetSafeTrackServiceURLWithOutUserTrackingDomain {
     XCTAssertEqualObjects(storedUrl, expectedUrl);
 
     storedUrl = [[BNCServerAPI sharedInstance] validationServiceURL];
-    expectedUrl = @"https://links.toTestDomain.com/v1/app-link-settings";
+    expectedUrl = @"https://api3.branch.io/v1/app-link-settings";
     XCTAssertEqualObjects(storedUrl, expectedUrl);
 
     [BNCServerAPI sharedInstance].useTrackingDomain = NO;

Branch-TestBed/Branch-SDK-Tests/BNCODMTests.m

@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "Branch.h"
+@import BranchSDK;
 #import "BNCPreferenceHelper.h"
 #import "BNCRequestFactory.h"
 #import "BNCEncodingUtils.h"
@@ -65,7 +65,7 @@ - (void)testSetODMandSDKRequests {
 }
 
 - (void)testODMTimeOut {
-
+    
     NSString* requestUUID = [[NSUUID UUID ] UUIDString];
     NSNumber* requestCreationTimeStamp = BNCWireFormatFromDate([NSDate date]);
     NSString *odm = @"testODMString";
@@ -80,21 +80,23 @@ - (void)testODMTimeOut {
 
     sleep(10);
 
-    NSDictionary *jsonOpen = [factory dataForOpenWithURLString:@"https://branch.io"];
+    BNCRequestFactory *factory2 = [[BNCRequestFactory alloc] initWithBranchKey:@"key_abcd" UUID:requestUUID TimeStamp:requestCreationTimeStamp];
+    NSDictionary *jsonOpen = [factory2 dataForOpenWithURLString:@"https://branch.io"];
     XCTAssertTrue(![odm isEqualToString:[jsonOpen objectForKey:@"odm_info"]]);
 
     self.prefHelper.odmInfo = nil;
     self.prefHelper.odmInfoInitDate = nil;
-
+    
 }
 
 
 - (void) testODMAPIsNotLoaded {
+
     XCTestExpectation *expectation = [self expectationWithDescription:@"Check if ODCManager class is loaded."];
-    [[BNCODMInfoCollector instance ] loadODMInfoWithTimeOut:DISPATCH_TIME_FOREVER andCompletionHandler:^(NSString * _Nullable odmInfo, NSError * _Nullable error) {
-            if (error.code == BNCClassNotFoundError){
-                [expectation fulfill];
-            }
+    [[BNCODMInfoCollector instance ] loadODMInfoWithCompletionHandler:^(NSString * _Nullable odmInfo, NSError * _Nullable error) {
+        if (error.code == BNCClassNotFoundError){
+            [expectation fulfill];
+        }
     }];
     [self waitForExpectationsWithTimeout:15 handler:nil];
 }

Branch-TestBed/Branch-SDK-Tests/BNCPasteboardTests.m

@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "BNCPasteboard.h"
-#import "Branch.h"
+@import BranchSDK;
 
 @interface BNCPasteboardTests : XCTestCase
 

Branch-TestBed/Branch-SDK-Tests/BNCPreferenceHelperTests.m

@@ -9,7 +9,7 @@
 #import <XCTest/XCTest.h>
 #import "BNCPreferenceHelper.h"
 #import "BNCEncodingUtils.h"
-#import "Branch.h"
+@import BranchSDK;
 #import "BNCConfig.h"
 
 @interface BNCPreferenceHelper()
@@ -414,4 +414,27 @@ - (void)testSaveContentAnalyticsManifest {
     XCTAssertEqualObjects(retrievedManifest, dummyManifest);
 }
 
+- (void)testThirdPartyAPIsTimeoutDefaultValue {
+    XCTAssertEqual(self.prefHelper.thirdPartyAPIsWaitTime, 0.5,
+                   @"Default third party APIs timeout should be 0.5 seconds");
+}
+
+- (void)testThirdPartyAPIsTimeoutSetterGetter {
+    NSTimeInterval testTimeout1 = 1.0;
+    self.prefHelper.thirdPartyAPIsWaitTime = testTimeout1;
+    XCTAssertEqual(self.prefHelper.thirdPartyAPIsWaitTime, testTimeout1,
+                   @"Third party APIs timeout should be settable and retrievable");
+
+    NSTimeInterval testTimeout2 = 2.5;
+    self.prefHelper.thirdPartyAPIsWaitTime = testTimeout2;
+    XCTAssertEqual(self.prefHelper.thirdPartyAPIsWaitTime, testTimeout2,
+                   @"Third party APIs timeout should be updatable");
+
+    NSTimeInterval testTimeout3 = 0.1;
+    self.prefHelper.thirdPartyAPIsWaitTime = testTimeout3;
+    XCTAssertEqual(self.prefHelper.thirdPartyAPIsWaitTime, testTimeout3,
+                   @"Third party APIs timeout should support small values");
+}
+
+
 @end

Branch-TestBed/Branch-SDK-Tests/Branch-SDK-Tests-Bridging-Header.h

@@ -2,4 +2,4 @@
 //  Module headers for Branch SDK unit testing.
 //
 
-#import "Branch.h"
+@import BranchSDK;

Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m

@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "Branch.h"
+@import BranchSDK;
 
 @interface BranchActivityItemTests: XCTestCase
 @end