ref: Migrate SentryBinaryImageCache to Swift

SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h

@@ -25,7 +25,6 @@
 
 #import "PrivateSentrySDKOnly.h"
 #import "SentryAppStartMeasurement.h"
-#import "SentryBinaryImageCache.h"
 #import "SentryClient+Private.h"
 #import "SentryClient+TestInit.h"
 #import "SentryCrash+Test.h"

Sources/Resources/Sentry.modulemap

@@ -9,7 +9,6 @@ framework module Sentry {
         header "PrivateSentrySDKOnly.h"
         header "PrivatesHeader.h"
         header "SentryAppStartMeasurement.h"
-        header "SentryBinaryImageCache.h"
         header "SentryBreadcrumb+Private.h"
         header "SentryDebugImageProvider+HybridSDKs.h"
         header "SentryDependencyContainer.h"

Sources/Sentry/SentryCrashStackEntryMapper.m

@@ -1,5 +1,4 @@
 #import "SentryCrashStackEntryMapper.h"
-#import "SentryBinaryImageCache.h"
 #import "SentryDependencyContainer.h"
 #import "SentryFormatter.h"
 #import "SentryFrame.h"
@@ -42,7 +41,7 @@ - (SentryFrame *)sentryCrashStackEntryToSentryFrame:(SentryCrashStackEntry)stack
     // we get image from the cache.
     if (stackEntry.imageAddress == 0 && stackEntry.imageName == NULL) {
         SentryBinaryImageInfo *info = [SentryDependencyContainer.sharedInstance.binaryImageCache
-            imageByAddress:stackEntry.address];
+            imageByAddress:(uint64_t)stackEntry.address];
 
         frame.imageAddress = sentry_formatHexAddressUInt64(info.address);
         frame.package = info.name;

Sources/Sentry/SentryDebugImageProvider.m

@@ -1,5 +1,4 @@
 #import "SentryDebugImageProvider.h"
-#import "SentryBinaryImageCache.h"
 #import "SentryDebugImageProvider+HybridSDKs.h"
 #if !SDK_V9
 #    import "SentryCrashDefaultBinaryImageProvider.h"
@@ -13,6 +12,7 @@
 #import "SentryInternalDefines.h"
 #import "SentryLogC.h"
 #import "SentryStacktrace.h"
+#import "SentrySwift.h"
 #import "SentryThread.h"
 #import <Foundation/Foundation.h>
 
@@ -228,7 +228,7 @@ - (SentryDebugMeta *)fillDebugMetaFrom:(SentryCrashBinaryImage)image
 - (SentryDebugMeta *)fillDebugMetaFromBinaryImageInfo:(SentryBinaryImageInfo *)info
 {
     SentryDebugMeta *debugMeta = [[SentryDebugMeta alloc] init];
-    debugMeta.debugID = info.UUID;
+    debugMeta.debugID = info.uuid;
     debugMeta.type = SentryDebugImageType;
 
     if (info.vmAddress > 0) {

Sources/Sentry/SentryDependencyContainer.m

@@ -1,7 +1,6 @@
 #import "SentryANRTrackerV1.h"
 
 #import "SentryApplication.h"
-#import "SentryBinaryImageCache.h"
 #import "SentryDefaultObjCRuntimeWrapper.h"
 #import "SentryDispatchFactory.h"
 #import "SentryDisplayLinkWrapper.h"

Sources/Sentry/SentrySDKInternal.m

@@ -3,7 +3,6 @@
 #import "SentryANRTrackingIntegration.h"
 #import "SentryAppStartMeasurement.h"
 #import "SentryAppStateManager.h"
-#import "SentryBinaryImageCache.h"
 #import "SentryBreadcrumb.h"
 #import "SentryClient+Private.h"
 #import "SentryCrash.h"

Sources/Sentry/SentryUIViewControllerSwizzling.m

@@ -2,7 +2,6 @@
 
 #if SENTRY_HAS_UIKIT
 
-#    import "SentryBinaryImageCache.h"
 #    import "SentryDefaultObjCRuntimeWrapper.h"
 #    import "SentryDefines.h"
 #    import "SentryDependencyContainer.h"

Sources/Sentry/include/SentryBinaryImageCacheCallbacks.h

@@ -0,0 +1,14 @@
+#import "SentryCrashDynamicLinker.h"
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void binaryImageWasAdded(const SentryCrashBinaryImage *_Nullable image);
+
+void binaryImageWasRemoved(const SentryCrashBinaryImage *_Nullable image);
+
+#ifdef __cplusplus
+}
+#endif

Sources/SentryCrash/Recording/SentryCrashBinaryImageCache.h → Sources/Sentry/include/SentryCrashBinaryImageCache.h

@@ -4,6 +4,10 @@
 #include "SentryCrashDynamicLinker.h"
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (*sentrycrashbic_imageIteratorCallback)(SentryCrashBinaryImage *, void *context);
 
 typedef void (*sentrycrashbic_cacheChangeCallback)(const SentryCrashBinaryImage *binaryImage);
@@ -33,4 +37,8 @@ void sentrycrashbic_registerAddedCallback(sentrycrashbic_cacheChangeCallback cal
  */
 void sentrycrashbic_registerRemovedCallback(sentrycrashbic_cacheChangeCallback callback);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SentryCrashBinaryImageCache_h */

Sources/SentryCrash/Recording/Tools/SentryCrashDynamicLinker.h → Sources/Sentry/include/SentryCrashDynamicLinker.h

@@ -28,14 +28,14 @@
 #ifndef HDR_SentryCrashDynamicLinker_h
 #define HDR_SentryCrashDynamicLinker_h
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <dlfcn.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SENTRY_DYLD_INDEX UINT_MAX - 1
 
 #if __LP64__

Sources/Sentry/include/SentryPrivate.h

@@ -1,7 +1,11 @@
 // Sentry internal headers that are needed for swift code; you cannot import headers that depend on
 // public interfaces here
 #import "NSLocale+Sentry.h"
+#import "SentryBinaryImageCacheCallbacks.h"
+#import "SentryCrashBinaryImageCache.h"
+#import "SentryCrashDynamicLinker.h"
 #import "SentryCrashExceptionApplicationHelper.h"
+#import "SentryCrashUUIDConversion.h"
 #import "SentryEventSwiftHelper.h"
 #import "SentryNSDataUtils.h"
 #import "SentryObjCRuntimeWrapper.h"