INTENG-21518 - SPM + Hybrid app compilation issue. (#1479)

* Workaround - Fixed podspec and framework structure for SPM umbrella header issue for hybrid apps.

Removing exclusion of some header files from podspec and framework structure because these headers are part of umbrella header of BranchSDK.

* Updated GHA - it was using deprecated version of `actions/upload-artifact: v3'

---------

Co-authored-by: nsingh-branch <[email protected]>

Author: NidhiDixit09

.github/workflows/verify.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Run unit tests
         run: bundle exec fastlane unit_tests
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always() # even if tests fail
         with:
           name: test-results

BranchSDK.podspec

@@ -25,11 +25,6 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
   s.tvos.exclude_files = "Sources/BranchSDK/**/BNCContentDiscoveryManager.{h,m}",
 	"Sources/BranchSDK/**/BNCUserAgentCollector.{h,m}",
 	"Sources/BranchSDK/**/BNCSpotlightService.{h,m}",
-	"Sources/BranchSDK/**/BranchActivityItemProvider.{h,m}",
-	"Sources/BranchSDK/**/BranchCSSearchableItemAttributeSet.{h,m}",
-	"Sources/BranchSDK/**/BranchShareLink.{h,m}",
-	"Sources/BranchSDK/**/BranchPasteControl.{h,m}"
-
   s.frameworks = 'CoreServices', 'SystemConfiguration'
   s.weak_framework = 'LinkPresentation'
   s.ios.frameworks = 'WebKit'

BranchSDK.xcodeproj/project.pbxproj

@@ -250,7 +250,7 @@
 		5FCDD4B82B7AC6A200EAF29F /* BNCServerRequestQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AA2B7AC6A100EAF29F /* BNCServerRequestQueue.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FCDD4B92B7AC6A200EAF29F /* BranchPasteControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AB2B7AC6A100EAF29F /* BranchPasteControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FCDD4BA2B7AC6A200EAF29F /* BranchPasteControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AB2B7AC6A100EAF29F /* BranchPasteControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5FCDD4BB2B7AC6A200EAF29F /* BranchPasteControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AB2B7AC6A100EAF29F /* BranchPasteControl.h */; };
+		5FCDD4BB2B7AC6A200EAF29F /* BranchPasteControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AB2B7AC6A100EAF29F /* BranchPasteControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FCDD4BC2B7AC6A200EAF29F /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AC2B7AC6A100EAF29F /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FCDD4BD2B7AC6A200EAF29F /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AC2B7AC6A100EAF29F /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5FCDD4BE2B7AC6A200EAF29F /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FCDD3AC2B7AC6A100EAF29F /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1173,6 +1173,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5FCDD4BB2B7AC6A200EAF29F /* BranchPasteControl.h in Headers */,
 				5FCDD5302B7AC6A300EAF29F /* Branch+Validator.h in Headers */,
 				5FCDD4A62B7AC6A200EAF29F /* BNCCallbacks.h in Headers */,
 				5FCDD4942B7AC6A100EAF29F /* BranchLinkProperties.h in Headers */,
@@ -1239,7 +1240,6 @@
 				5FCDD51B2B7AC6A300EAF29F /* NSError+Branch.h in Headers */,
 				5FCDD5032B7AC6A300EAF29F /* BranchOpenRequest.h in Headers */,
 				5FCDD4F72B7AC6A200EAF29F /* BNCEventUtils.h in Headers */,
-				5FCDD4BB2B7AC6A200EAF29F /* BranchPasteControl.h in Headers */,
 				5FCDD5632B7AC6A300EAF29F /* BNCReachability.h in Headers */,
 				5FCDD50F2B7AC6A300EAF29F /* NSMutableDictionary+Branch.h in Headers */,
 				5FCDD4D92B7AC6A200EAF29F /* BNCAppleReceipt.h in Headers */,

Framework/BranchSDK.h

@@ -30,14 +30,10 @@ FOUNDATION_EXPORT const unsigned char BranchSDKVersionString[];
 
 #import <BranchSDK/BranchDeepLinkingController.h>
 
-#if !TARGET_OS_TV
-// tvOS does not support these features
 #import <BranchSDK/BranchShareLink.h>
 #import <BranchSDK/BranchCSSearchableItemAttributeSet.h>
 #import <BranchSDK/BranchActivityItemProvider.h>
-
 #import <BranchSDK/BranchPasteControl.h>
-#endif
 
 // Used by Branch.h for debug and testing APIs. Need to move these.
 #import <BranchSDK/BNCInitSessionResponse.h>

Sources/BranchSDK/Public/BranchSDK.h

@@ -30,14 +30,10 @@ FOUNDATION_EXPORT const unsigned char BranchSDKVersionString[];
 #import "BranchDeepLinkingController.h"
 #import "BranchLogger.h"
 
-#if !TARGET_OS_TV
-// tvOS does not support these features
 #import "BranchShareLink.h"
 #import "BranchCSSearchableItemAttributeSet.h"
 #import "BranchActivityItemProvider.h"
-
 #import "BranchPasteControl.h"
-#endif
 
 // Used by Branch.h for debug and testing APIs. Need to move these.
 #import "BNCInitSessionResponse.h"