fix more conditional compilation for UIKit

getsentry · Aug 29, 2023 · bc99782 · bc99782
1 parent 01292d2
commit bc99782
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h b/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
@@ -15,7 +15,6 @@
 @class SentrySwizzleWrapper;
 @class SentrySystemWrapper;
 @class SentryThreadWrapper;
-@class SentryUIDeviceWrapper;
 @protocol SentryRandom;
 
 #if SENTRY_HAS_METRIC_KIT
@@ -26,6 +25,7 @@
 @class SentryFramesTracker;
 @class SentryScreenshot;
 @class SentryUIApplication;
+@class SentryUIDeviceWrapper;
 @class SentryViewHierarchy;
 #endif
 

diff --git a/Tests/SentryTests/Helper/SentryExtraContextProviderTests.swift b/Tests/SentryTests/Helper/SentryExtraContextProviderTests.swift
@@ -5,11 +5,15 @@ final class SentryExtraContextProviderTests: XCTestCase {
 
     private class Fixture {
         let crashWrapper = TestSentryCrashWrapper.sharedInstance()
+#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
         let deviceWrapper = TestSentryUIDeviceWrapper()
+#endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
         let processWrapper = TestSentryNSProcessInfoWrapper()
 
         func getSut() -> SentryExtraContextProvider {
+            #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
             SentryDependencyContainer.sharedInstance().uiDeviceWrapper = deviceWrapper
+            #endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
             return SentryExtraContextProvider(
                     crashWrapper: crashWrapper,
                     processInfoWrapper: processWrapper)

diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -29,7 +29,9 @@ class SentryClientTest: XCTestCase {
         let trace = SentryTracer(transactionContext: TransactionContext(name: "SomeTransaction", operation: "SomeOperation"), hub: nil)
         let transaction: Transaction
         let crashWrapper = TestSentryCrashWrapper.sharedInstance()
+        #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
         let deviceWrapper = TestSentryUIDeviceWrapper()
+        #endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
         let processWrapper = TestSentryNSProcessInfoWrapper()
         let extraContentProvider: SentryExtraContextProvider
         let locale = Locale(identifier: "en_US")
@@ -63,7 +65,9 @@ class SentryClientTest: XCTestCase {
             crashWrapper.internalAppMemorySize = 234_567
             crashWrapper.internalFreeStorageSize = 345_678
 
+            #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
             SentryDependencyContainer.sharedInstance().uiDeviceWrapper = deviceWrapper
+#endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
 
             extraContentProvider = SentryExtraContextProvider(crashWrapper: crashWrapper, processInfoWrapper: processWrapper)
         }

diff --git a/Tests/SentryTests/SentryCrash/TestSentryUIDeviceWrapper.swift b/Tests/SentryTests/SentryCrash/TestSentryUIDeviceWrapper.swift
@@ -1,7 +1,7 @@
 import Sentry
 
+#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
 class TestSentryUIDeviceWrapper: SentryUIDeviceWrapper {
-#if os(iOS)
     var internalOrientation = UIDeviceOrientation.portrait
     var internalIsBatteryMonitoringEnabled = true
     var internalBatteryLevel: Float = 0.6
@@ -22,5 +22,5 @@ class TestSentryUIDeviceWrapper: SentryUIDeviceWrapper {
     override func batteryState() -> UIDevice.BatteryState {
         return internalBatteryState
     }
-#endif
 }
+#endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)