PR feedback

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -570,8 +570,8 @@
 		7BD86ECD264A78A6005439DB /* SentryAppStartTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD86ECC264A78A6005439DB /* SentryAppStartTrackerTests.swift */; };
 		7BD86ECF264A7C77005439DB /* SentryAppStartMeasurement.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BD86ECE264A7C77005439DB /* SentryAppStartMeasurement.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7BD86ED1264A7CF6005439DB /* SentryAppStartMeasurement.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BD86ED0264A7CF6005439DB /* SentryAppStartMeasurement.m */; };
-		7BDB03B7251364F800BAE198 /* SentryDispatchQueueWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BDB03B6251364F800BAE198 /* SentryDispatchQueueWrapper.h */; };
-		7BDB03BB2513652900BAE198 /* SentryDispatchQueueWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDB03BA2513652900BAE198 /* SentryDispatchQueueWrapper.m */; };
+		7BDB03B7251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BDB03B6251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h */; };
+		7BDB03BB2513652900BAE198 /* _SentryDispatchQueueWrapperInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDB03BA2513652900BAE198 /* _SentryDispatchQueueWrapperInternal.m */; };
 		7BDDE3CC2966BD4700EB9177 /* SentryMXManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BDDE3CB2966BD4700EB9177 /* SentryMXManagerTests.swift */; };
 		7BDEAA022632A4580001EA25 /* SentryOptions+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BDEAA002632A4580001EA25 /* SentryOptions+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		7BE0DC29272A9E1C004FA8B7 /* SentryBreadcrumbTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE0DC28272A9E1C004FA8B7 /* SentryBreadcrumbTrackerTests.swift */; };
@@ -1762,8 +1762,8 @@
 		7BD86ECC264A78A6005439DB /* SentryAppStartTrackerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAppStartTrackerTests.swift; sourceTree = "<group>"; };
 		7BD86ECE264A7C77005439DB /* SentryAppStartMeasurement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryAppStartMeasurement.h; path = include/HybridPublic/SentryAppStartMeasurement.h; sourceTree = "<group>"; };
 		7BD86ED0264A7CF6005439DB /* SentryAppStartMeasurement.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAppStartMeasurement.m; sourceTree = "<group>"; };
-		7BDB03B6251364F800BAE198 /* SentryDispatchQueueWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDispatchQueueWrapper.h; path = include/SentryDispatchQueueWrapper.h; sourceTree = "<group>"; };
-		7BDB03BA2513652900BAE198 /* SentryDispatchQueueWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDispatchQueueWrapper.m; sourceTree = "<group>"; };
+		7BDB03B6251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = _SentryDispatchQueueWrapperInternal.h; path = include/_SentryDispatchQueueWrapperInternal.h; sourceTree = "<group>"; };
+		7BDB03BA2513652900BAE198 /* _SentryDispatchQueueWrapperInternal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = _SentryDispatchQueueWrapperInternal.m; sourceTree = "<group>"; };
 		7BDB03BE25136A7D00BAE198 /* TestSentryDispatchQueueWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryDispatchQueueWrapper.swift; sourceTree = "<group>"; };
 		7BDDE3CB2966BD4700EB9177 /* SentryMXManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryMXManagerTests.swift; sourceTree = "<group>"; };
 		7BDEAA002632A4580001EA25 /* SentryOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryOptions+Private.h"; path = "include/SentryOptions+Private.h"; sourceTree = "<group>"; };
@@ -2518,8 +2518,8 @@
 				638DC99E1EBC6B6400A66E41 /* SentryRequestOperation.h */,
 				638DC99F1EBC6B6400A66E41 /* SentryRequestOperation.m */,
 				D4291A672DD61A3F00772088 /* SentryDispatchQueueProviderProtocol.h */,
-				7BDB03B6251364F800BAE198 /* SentryDispatchQueueWrapper.h */,
-				7BDB03BA2513652900BAE198 /* SentryDispatchQueueWrapper.m */,
+				7BDB03B6251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h */,
+				7BDB03BA2513652900BAE198 /* _SentryDispatchQueueWrapperInternal.m */,
 				D4FC68162DD632E7001B74FF /* SentryDispatchSourceProviderProtocol.h */,
 				84AC61D129F7541E009EEF61 /* SentryDispatchSourceWrapper.m */,
 				84AC61D029F7541E009EEF61 /* SentryDispatchSourceWrapper.h */,
@@ -4816,7 +4816,7 @@
 				7B2BB0032966F55900A1E102 /* SentryOptions+HybridSDKs.h in Headers */,
 				7BF9EF762722B34700B5BBEF /* SentrySubClassFinder.h in Headers */,
 				7BC852332458802C005A70F0 /* SentryDataCategoryMapper.h in Headers */,
-				7BDB03B7251364F800BAE198 /* SentryDispatchQueueWrapper.h in Headers */,
+				7BDB03B7251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h in Headers */,
 				7BF9EF842722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h in Headers */,
 				621AE74B2C626C230012E730 /* SentryANRTrackerV2.h in Headers */,
 				639889B71EDECFA800EA7442 /* SentryBreadcrumbTracker.h in Headers */,
@@ -5280,7 +5280,7 @@
 				7BD4BD4527EB29F50071F4FF /* SentryClientReport.m in Sources */,
 				631E6D341EBC679C00712345 /* SentryQueueableRequestManager.m in Sources */,
 				7B8713B426415BAA006D6004 /* SentryAppStartTracker.m in Sources */,
-				7BDB03BB2513652900BAE198 /* SentryDispatchQueueWrapper.m in Sources */,
+				7BDB03BB2513652900BAE198 /* _SentryDispatchQueueWrapperInternal.m in Sources */,
 				D8739D142BEE5049007D2F66 /* SentryRRWebSpanEvent.swift in Sources */,
 				7B6C5EDE264E8DF00010D138 /* SentryFramesTracker.m in Sources */,
 				D84F833E2A1CC401005828E0 /* SentrySwiftAsyncIntegration.m in Sources */,

Sources/Sentry/SentryDispatchQueueWrapper.m renamed to Sources/Sentry/_SentryDispatchQueueWrapperInternal.m

@@ -1,9 +1,9 @@
-#import "SentryDispatchQueueWrapper.h"
+#import "_SentryDispatchQueueWrapperInternal.h"
 #import "SentryThreadWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@implementation SentryDispatchQueueWrapperInternal
+@implementation _SentryDispatchQueueWrapperInternal
 
 - (instancetype)init
 {

Sources/Sentry/include/SentryPrivate.h

@@ -2,12 +2,12 @@
 // public interfaces here
 #import "NSLocale+Sentry.h"
 #import "SentryCrashExceptionApplicationHelper.h"
-#import "SentryDispatchQueueWrapper.h"
 #import "SentryEventSwiftHelper.h"
 #import "SentryNSDataUtils.h"
 #import "SentryRandom.h"
 #import "SentryTime.h"
 #import "SentryUserAccess.h"
+#import "_SentryDispatchQueueWrapperInternal.h"
 
 // Headers that also import SentryDefines should be at the end of this list
 // otherwise it wont compile

Sources/Sentry/include/SentryDispatchQueueWrapper.h renamed to Sources/Sentry/include/_SentryDispatchQueueWrapperInternal.h

@@ -4,8 +4,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * A wrapper around DispatchQueue functions for testability.
+ * This should not be used directly, instead the  Swift version in
+ * SentryDispatchQueueWrapper should be used to ensure compatibility
+ * with Swift code.
  */
-@interface SentryDispatchQueueWrapperInternal : NSObject
+@interface _SentryDispatchQueueWrapperInternal : NSObject
 
 @property (strong, nonatomic) dispatch_queue_t queue;
 

Sources/Swift/Helper/SentryDispatchQueueWrapper.swift

@@ -1,15 +1,18 @@
 @_implementationOnly import _SentryPrivate
 
+// This is the Swift verion of `_SentryDispatchQueueWrapperInternal`
+// It exists to allow the implementation of `_SentryDispatchQueueWrapperInternal`
+// to be accessible to Swift without making that header file public
 @objcMembers class SentryDispatchQueueWrapper: NSObject {
 
-    let internalWrapper: SentryDispatchQueueWrapperInternal
+    let internalWrapper: _SentryDispatchQueueWrapperInternal
 
     public override init() {
-        internalWrapper = SentryDispatchQueueWrapperInternal()
+        internalWrapper = _SentryDispatchQueueWrapperInternal()
     }
 
     public init(name: UnsafePointer<CChar>, attributes: __OS_dispatch_queue_attr?) {
-        internalWrapper = SentryDispatchQueueWrapperInternal(name: name, attributes: attributes)
+        internalWrapper = _SentryDispatchQueueWrapperInternal(name: name, attributes: attributes)
     }
 
     public var queue: DispatchQueue {

Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegration+TestInit.h

@@ -1,5 +1,4 @@
 #import "SentryCrashIntegration.h"
-#import "SentryDispatchQueueWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Tests/SentryTests/SentryTests-Bridging-Header.h

@@ -112,7 +112,6 @@
 #import "SentryDiscardReasonMapper.h"
 #import "SentryDiscardedEvent.h"
 #import "SentryDispatchFactory.h"
-#import "SentryDispatchQueueWrapper.h"
 #import "SentryDispatchSourceWrapper.h"
 #import "SentryDisplayLinkWrapper.h"
 #import "SentryDsn.h"