Merge d882e8a into 6230686

getsentry · Oct 21, 2024 · 36816c8 · 36816c8
2 parents 6230686 + d882e8a
commit 36816c8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Build visionOS project with static Sentry SDK (#4462)
+
 ## 8.39.0-beta.1
 
 ### Removal of Experimental API

diff --git a/Sources/Configuration/SDK.xcconfig b/Sources/Configuration/SDK.xcconfig
@@ -47,3 +47,4 @@ GCC_PREPROCESSOR_DEFINITIONS_TestCI = DEBUG=1 TEST=1 TESTCI=1
 GCC_PREPROCESSOR_DEFINITIONS_Release = RELEASE=1
 GCC_PREPROCESSOR_DEFINITIONS_ReleaseWithoutUIKit = RELEASE=1 SENTRY_NO_UIKIT=1
 GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS_$(CONFIGURATION))
+SWIFT_OBJC_INTEROP_MODE[sdk=xr*]=objcxx
diff --git a/Sources/Sentry/SentryLevelHelper.m b/Sources/Sentry/SentryLevelHelper.m
@@ -1,8 +1,8 @@
 #import "SentryLevelHelper.h"
 #import "SentryBreadcrumb+Private.h"
 
-NSUInteger
-sentry_breadcrumbLevel(SentryBreadcrumb *breadcrumb)
-{
+@implementation SentryLevelBridge : NSObject
++ (NSUInteger) breadcrumbLevel:(SentryBreadcrumb *)breadcrumb {
     return breadcrumb.level;
 }
+@end
diff --git a/Sources/Sentry/SentrySDK.m b/Sources/Sentry/SentrySDK.m
@@ -14,6 +14,7 @@
 #import "SentryHub+Private.h"
 #import "SentryInternalDefines.h"
 #import "SentryLog.h"
+#import "SentryLogC.h"
 #import "SentryMeta.h"
 #import "SentryOptions+Private.h"
 #import "SentryProfilingConditionals.h"
@@ -202,6 +203,7 @@ + (void)startWithOptions:(SentryOptions *)options
 {
     startOption = options;
     [SentryLog configure:options.debug diagnosticLevel:options.diagnosticLevel];
+    sentry_initializeAsyncLogFile();
 
     // We accept the tradeoff that the SDK might not be fully initialized directly after
     // initializing it on a background thread because scheduling the init synchronously on the main

diff --git a/Sources/Sentry/include/SentryLevelHelper.h b/Sources/Sentry/include/SentryLevelHelper.h
@@ -7,6 +7,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * This is a workaround to access SentryLevel value from swift
  */
-NSUInteger sentry_breadcrumbLevel(SentryBreadcrumb *breadcrumb);
+@interface SentryLevelBridge : NSObject
++ (NSUInteger) breadcrumbLevel:(SentryBreadcrumb *)breadcrumb;
+@end
 
 NS_ASSUME_NONNULL_END
diff --git a/Sources/Swift/Helper/Log/SentryLevel.swift b/Sources/Swift/Helper/Log/SentryLevel.swift
@@ -47,6 +47,6 @@ class SentryLevelHelper: NSObject {
     }
 
     static func breadcrumbLevel(_ breadcrumb: Breadcrumb) -> SentryLevel? {
-        SentryLevel(rawValue: sentry_breadcrumbLevel(breadcrumb))
+        SentryLevel(rawValue: SentryLevelBridge.breadcrumbLevel(breadcrumb))
     }
 }
diff --git a/Sources/Swift/Tools/SentryLog.swift b/Sources/Swift/Tools/SentryLog.swift
@@ -15,7 +15,6 @@ class SentryLog: NSObject {
             self.isDebug = isDebug
             self.diagnosticLevel = diagnosticLevel
         }
-        sentry_initializeAsyncLogFile()
     }
 
     @objc
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ class SentryLog: NSObject { @@
                 self.isDebug = isDebug
                 self.diagnosticLevel = diagnosticLevel
             }
-            sentry_initializeAsyncLogFile()
         }
         @objc
@@ Expand Down @@