Merge branch '4.0.0-alpha.0' into feature/remove-bridging-code

Author: wpinho-branch

.github/workflows/pre-release-qa.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   verify-cocoapods-iOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
             carthage update --use-xcframeworks
             xcodebuild test -scheme iOSReleaseTest -project iOSReleaseTest.xcodeproj -destination "$DESTINATION" | xcpretty && exit ${PIPESTATUS[0]}
   verify-SPM-iOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
             cd  SDKIntegrationTestApps/iOSReleaseTest-SPM/
             xcodebuild test -scheme iOSReleaseTest -project iOSReleaseTest.xcodeproj -destination "$DESTINATION" | xcpretty && exit ${PIPESTATUS[0]}
   verify-manually-with-xcframework-iOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
             cd  SDKIntegrationTestApps/iOSReleaseTest-Manual/
             xcodebuild test -scheme iOSReleaseTest -project iOSReleaseTest.xcodeproj -destination "$DESTINATION" | xcpretty && exit ${PIPESTATUS[0]}
   verify-manually-with-StaticFramework-iOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
             cd  SDKIntegrationTestApps/iOSReleaseTest-Manual-Static/
             xcodebuild test -scheme iOSReleaseTest -project iOSReleaseTest.xcodeproj -destination "$DESTINATION" | xcpretty && exit ${PIPESTATUS[0]}
   verify-cocoapods-tvOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -80,7 +80,7 @@ jobs:
             pod install
             xcodebuild test -scheme tvOSReleaseTest -workspace tvOSReleaseTest.xcworkspace -destination "$DESTINATION" | xcpretty && exit ${PIPESTATUS[0]}
   verify-carthage-tvOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
             cd  SDKIntegrationTestApps/tvOSReleaseTest-Carthage/
             echo "Skipping it ... its broken"
   verify-manually-with-xcframework-tvOS:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.github/workflows/verify.yml

@@ -13,37 +13,13 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Set up Ruby 2.7
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-      - name: Restore cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            vendor
-            Branch-TestBed/Pods
-          key: ${{ runner.os }}-${{ hashFiles('Gemfile.lock','Branch-TestBed/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-
-      - name: Install Ruby dependencies
-        run: |
-          bundle config set --local path vendor
-          bundle check || bundle install
-      # This happens automatically with the unit_tests lane, but adding it here
-      # makes it easier to keep track of installation time via GHA without
-      # adding execution time to the next step.
-      #- name: Install CocoaPods dependencies
-      #  run: bundle exec fastlane prepare_pods
       - name: Run unit tests
-        run: bundle exec fastlane unit_tests
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: always() # even if tests fail
-        with:
-          name: test-results
-          path: fastlane/test_output
-      - name: Upload codecov  results
-        uses: codecov/codecov-action@v5
-        with:
-          files: ./fastlane/test_output/cobertura.xml
+        run: |
+          echo "branch=${{ github.ref }}" >> $GITHUB_OUTPUT
+          ./scripts/getSimulator
+          DESTINATION="platform=iOS Simulator,name=$(cat ./iphoneSim),OS=latest"
+          xcodebuild test \
+            -project BranchSDK.xcodeproj \
+            -scheme BranchSDKTests \
+            -destination "$DESTINATION" \
+            -testPlan BranchSDKTests | xcpretty && exit ${PIPESTATUS[0]}

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -18,10 +18,12 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
   s.ios.deployment_target = '12.0'
   s.tvos.deployment_target = '12.0'
 
+    s.swift_versions = ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0'] 
+
   s.resource_bundles = { 'BranchSDK' => 'Sources/Resources/*.xcprivacy' }
-  s.ios.source_files = "Sources/BranchSDK/**/*.{h,m}"
+  s.ios.source_files = "Sources/BranchSDK/**/*.{h,m}", "Sources/BranchSDK_Swift/**/*.swift", "Sources/BranchSDK_ObjC/**/*.{h,m}"
 
-  s.tvos.source_files = "Sources/BranchSDK/**/*.{h,m}"
+  s.tvos.source_files = "Sources/BranchSDK/**/*.{h,m}", "Sources/BranchSDK_Swift/**/*.swift", "Sources/BranchSDK_ObjC/**/*.{h,m}" 
   s.tvos.exclude_files = "Sources/BranchSDK/**/BNCContentDiscoveryManager.{h,m}",
 	"Sources/BranchSDK/**/BNCUserAgentCollector.{h,m}",
 	"Sources/BranchSDK/**/BNCSpotlightService.{h,m}",