Merge pull request #1034 from DataDog/carlosnogueira/RUM-12579/fix-tvOS-v2

[RUM-12579] Fix tvOS builds

Author: cdn34dd

packages/core/ios/Sources/DatadogSDKWrapper.swift

@@ -10,10 +10,13 @@ import DatadogRUM
 import DatadogLogs
 import DatadogTrace
 import DatadogCrashReporting
-import DatadogWebViewTracking
 import DatadogInternal
 import Foundation
 
+#if os(iOS)
+import DatadogWebViewTracking
+#endif
+
 public typealias OnCoreInitializedListener = (DatadogCoreProtocol) -> Void
 
 /// Wrapper around the Datadog SDK. Use DatadogSDKWrapper.shared to access the instance.
@@ -156,6 +159,8 @@ public class DatadogSDKWrapper {
         )
     }
 
+
+#if os(iOS)
     // Webview
     private var webviewMessageEmitter: InternalExtension<WebViewTracking>.AbstractMessageEmitter?
 
@@ -170,6 +175,7 @@ public class DatadogSDKWrapper {
     internal func sendWebviewMessage(body: NSString) throws {
         try self.webviewMessageEmitter?.send(body: body)
     }
+#endif
 }
 
 

packages/core/ios/Sources/DdSdk.mm

@@ -128,9 +128,11 @@ - (dispatch_queue_t)methodQueue {
     return [RNQueue getSharedQueue];
 }
 
+#if TARGET_OS_IOS
 - (void)consumeWebviewEvent:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
     [self.ddSdkImplementation consumeWebviewEventWithMessage:message resolve:resolve reject:reject];
 }
+#endif
 
 - (void)initialize:(NSDictionary *)configuration resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
     [self.ddSdkImplementation initializeWithConfiguration:configuration resolve:resolve reject:reject];

packages/core/ios/Sources/DdSdkImplementation.swift

@@ -10,10 +10,13 @@ import DatadogRUM
 import DatadogLogs
 import DatadogTrace
 import DatadogCrashReporting
-import DatadogWebViewTracking
 import DatadogInternal
 import React
 
+#if os(iOS)
+import DatadogWebViewTracking
+#endif
+
 func getDefaultAppVersion() -> String {
     let bundleShortVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
     let bundleVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
@@ -27,7 +30,10 @@ public class DdSdkImplementation: NSObject {
     let mainDispatchQueue: DispatchQueueType
     let RUMMonitorProvider: () -> RUMMonitorProtocol
     let RUMMonitorInternalProvider: () -> RUMMonitorInternalProtocol?
+
+#if os(iOS)
     var webviewMessageEmitter: InternalExtension<WebViewTracking>.AbstractMessageEmitter?
+#endif
 
     private let jsLongTaskThresholdInSeconds: TimeInterval = 0.1;
 
@@ -149,6 +155,7 @@ public class DdSdkImplementation: NSObject {
         resolve(nil)
     }
 
+#if os(iOS)
     @objc
     public func consumeWebviewEvent(message: NSString, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
         do{
@@ -158,6 +165,7 @@ public class DdSdkImplementation: NSObject {
         }
         resolve(nil)
     }
+#endif
 
     @objc
     public func clearAllData(resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {

packages/core/ios/Sources/DdSdkNativeInitialization.swift

@@ -10,10 +10,13 @@ import DatadogRUM
 import DatadogLogs
 import DatadogTrace
 import DatadogCrashReporting
-import DatadogWebViewTracking
 import DatadogInternal
 import React
 
+#if os(iOS)
+import DatadogWebViewTracking
+#endif
+
 @objc
 public class DdSdkNativeInitialization: NSObject {
     let jsonFileReader: ResourceFileReader
@@ -90,7 +93,9 @@ public class DdSdkNativeInitialization: NSObject {
             DatadogSDKWrapper.shared.enableCrashReporting()
         }
 
+#if os(iOS)
         DatadogSDKWrapper.shared.enableWebviewTracking()
+#endif
     }
 
     func buildSDKConfiguration(configuration: DdSdkConfiguration, defaultAppVersion: String = getDefaultAppVersion()) -> Datadog.Configuration {