fix things similar to the dropbox patch

getsentry · Jul 2, 2024 · c02b560 · c02b560
1 parent 5863693
commit c02b560
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 50 deletions.
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -1758,7 +1758,7 @@
 		84DEE86A2B686BD400A7BC17 /* SentrySamplerDecision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySamplerDecision.h; path = include/SentrySamplerDecision.h; sourceTree = "<group>"; };
 		84DEE8752B69AD6400A7BC17 /* SentryLaunchProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryLaunchProfiling.h; path = Sources/Sentry/include/SentryLaunchProfiling.h; sourceTree = SOURCE_ROOT; };
 		84EACEBC2C33CA7A009B8753 /* SentryWithoutUIKit.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = SentryWithoutUIKit.modulemap; path = Sources/Resources/SentryWithoutUIKit.modulemap; sourceTree = SOURCE_ROOT; };
-		84EACEBE2C33D8CF009B8753 /* Sentry.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = Sentry.private.modulemap; path = Sources/Sentry/include/Sentry.private.modulemap; sourceTree = SOURCE_ROOT; };
+		84EACEBE2C33D8CF009B8753 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = Sources/Sentry/include/module.modulemap; sourceTree = SOURCE_ROOT; };
 		84EB21952BF01CEA00EDDA28 /* SentryCrashInstallationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashInstallationTests.swift; sourceTree = "<group>"; };
 		84F994E52A6894B500EC0190 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		84F994E72A6894BD00EC0190 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
@@ -1945,7 +1945,6 @@
 		D8B088B529C9E3FF00213258 /* SentryTracerConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryTracerConfiguration.m; sourceTree = "<group>"; };
 		D8B425112B9A0FD6000BFDF3 /* StringExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensionTests.swift; sourceTree = "<group>"; };
 		D8B665BA2B95F54200BD0E7B /* SentryPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryPrivate.h; path = include/SentryPrivate.h; sourceTree = "<group>"; };
-		D8B665BB2B95F5A100BD0E7B /* SentryWithoutUIKit.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = SentryWithoutUIKit.private.modulemap; path = Sources/Sentry/include/SentryWithoutUIKit.private.modulemap; sourceTree = SOURCE_ROOT; };
 		D8B76B042808060E000A58C4 /* SentryScreenshotIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScreenshotIntegrationTests.swift; sourceTree = "<group>"; };
 		D8B76B0728081461000A58C4 /* TestSentryScreenShot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryScreenShot.swift; sourceTree = "<group>"; };
 		D8BBD32628FD9FBF0011F850 /* SentrySwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySwift.h; path = include/SentrySwift.h; sourceTree = "<group>"; };
@@ -3576,8 +3575,7 @@
 				D856272A2A374A6800FB8062 /* Tools */,
 				D800942628F82F3A005D3943 /* SwiftDescriptor.swift */,
 				D87C892A2BC67BC20086C7DF /* SentryExperimentalOptions.swift */,
-				84EACEBE2C33D8CF009B8753 /* Sentry.private.modulemap */,
-				D8B665BB2B95F5A100BD0E7B /* SentryWithoutUIKit.private.modulemap */,
+				84EACEBE2C33D8CF009B8753 /* module.modulemap */,
 			);
 			path = Swift;
 			sourceTree = "<group>";

diff --git a/Sources/Configuration/Sentry.xcconfig b/Sources/Configuration/Sentry.xcconfig
@@ -15,4 +15,3 @@ PRODUCT_MODULE_NAME = $(PRODUCT_MODULE_NAME_$(CONFIGURATION))
 PRODUCT_NAME = $(PRODUCT_MODULE_NAME)
 PRODUCT_BUNDLE_IDENTIFIER = io.sentry.$(PRODUCT_MODULE_NAME)
 MODULEMAP_FILE = $(SRCROOT)/Sources/Resources/$(PRODUCT_MODULE_NAME_$(CONFIGURATION)).modulemap
-MODULEMAP_PRIVATE_FILE = $(SRCROOT)/Sources/Sentry/include/$(PRODUCT_MODULE_NAME_$(CONFIGURATION)).private.modulemap
diff --git a/Sources/Sentry/Public/Sentry.h b/Sources/Sentry/Public/Sentry.h
@@ -5,42 +5,82 @@ FOUNDATION_EXPORT double SentryVersionNumber;
 
 //! Project version string for Sentry.
 FOUNDATION_EXPORT const unsigned char SentryVersionString[];
-
-#import <Sentry/SentryAttachment.h>
-#import <Sentry/SentryBreadcrumb.h>
-#import <Sentry/SentryClient.h>
-#import <Sentry/SentryCrashExceptionApplication.h>
-#import <Sentry/SentryDebugImageProvider.h>
-#import <Sentry/SentryDebugMeta.h>
-#import <Sentry/SentryDefines.h>
-#import <Sentry/SentryDsn.h>
-#import <Sentry/SentryEnvelopeItemHeader.h>
-#import <Sentry/SentryError.h>
-#import <Sentry/SentryEvent.h>
-#import <Sentry/SentryException.h>
-#import <Sentry/SentryFrame.h>
-#import <Sentry/SentryGeo.h>
-#import <Sentry/SentryHttpStatusCodeRange.h>
-#import <Sentry/SentryHub.h>
-#import <Sentry/SentryMeasurementUnit.h>
-#import <Sentry/SentryMechanism.h>
-#import <Sentry/SentryMechanismMeta.h>
-#import <Sentry/SentryMessage.h>
-#import <Sentry/SentryNSError.h>
-#import <Sentry/SentryOptions.h>
-#import <Sentry/SentryRequest.h>
-#import <Sentry/SentrySDK.h>
-#import <Sentry/SentrySampleDecision.h>
-#import <Sentry/SentrySamplingContext.h>
-#import <Sentry/SentryScope.h>
-#import <Sentry/SentrySerializable.h>
-#import <Sentry/SentrySpanContext.h>
-#import <Sentry/SentrySpanId.h>
-#import <Sentry/SentrySpanProtocol.h>
-#import <Sentry/SentrySpanStatus.h>
-#import <Sentry/SentryStacktrace.h>
-#import <Sentry/SentryThread.h>
-#import <Sentry/SentryTraceHeader.h>
-#import <Sentry/SentryTransactionContext.h>
-#import <Sentry/SentryUser.h>
-#import <Sentry/SentryUserFeedback.h>
+#if SENTRY_NO_UIKIT
+#    import <SentryWithoutUIKit/SentryAttachment.h>
+#    import <SentryWithoutUIKit/SentryBreadcrumb.h>
+#    import <SentryWithoutUIKit/SentryClient.h>
+#    import <SentryWithoutUIKit/SentryCrashExceptionApplication.h>
+#    import <SentryWithoutUIKit/SentryDebugImageProvider.h>
+#    import <SentryWithoutUIKit/SentryDebugMeta.h>
+#    import <SentryWithoutUIKit/SentryDefines.h>
+#    import <SentryWithoutUIKit/SentryDsn.h>
+#    import <SentryWithoutUIKit/SentryEnvelopeItemHeader.h>
+#    import <SentryWithoutUIKit/SentryError.h>
+#    import <SentryWithoutUIKit/SentryEvent.h>
+#    import <SentryWithoutUIKit/SentryException.h>
+#    import <SentryWithoutUIKit/SentryFrame.h>
+#    import <SentryWithoutUIKit/SentryGeo.h>
+#    import <SentryWithoutUIKit/SentryHttpStatusCodeRange.h>
+#    import <SentryWithoutUIKit/SentryHub.h>
+#    import <SentryWithoutUIKit/SentryMeasurementUnit.h>
+#    import <SentryWithoutUIKit/SentryMechanism.h>
+#    import <SentryWithoutUIKit/SentryMechanismMeta.h>
+#    import <SentryWithoutUIKit/SentryMessage.h>
+#    import <SentryWithoutUIKit/SentryNSError.h>
+#    import <SentryWithoutUIKit/SentryOptions.h>
+#    import <SentryWithoutUIKit/SentryRequest.h>
+#    import <SentryWithoutUIKit/SentrySDK.h>
+#    import <SentryWithoutUIKit/SentrySampleDecision.h>
+#    import <SentryWithoutUIKit/SentrySamplingContext.h>
+#    import <SentryWithoutUIKit/SentryScope.h>
+#    import <SentryWithoutUIKit/SentrySerializable.h>
+#    import <SentryWithoutUIKit/SentrySpanContext.h>
+#    import <SentryWithoutUIKit/SentrySpanId.h>
+#    import <SentryWithoutUIKit/SentrySpanProtocol.h>
+#    import <SentryWithoutUIKit/SentrySpanStatus.h>
+#    import <SentryWithoutUIKit/SentryStacktrace.h>
+#    import <SentryWithoutUIKit/SentryThread.h>
+#    import <SentryWithoutUIKit/SentryTraceHeader.h>
+#    import <SentryWithoutUIKit/SentryTransactionContext.h>
+#    import <SentryWithoutUIKit/SentryUser.h>
+#    import <SentryWithoutUIKit/SentryUserFeedback.h>
+#else
+#    import <Sentry/SentryAttachment.h>
+#    import <Sentry/SentryBreadcrumb.h>
+#    import <Sentry/SentryClient.h>
+#    import <Sentry/SentryCrashExceptionApplication.h>
+#    import <Sentry/SentryDebugImageProvider.h>
+#    import <Sentry/SentryDebugMeta.h>
+#    import <Sentry/SentryDefines.h>
+#    import <Sentry/SentryDsn.h>
+#    import <Sentry/SentryEnvelopeItemHeader.h>
+#    import <Sentry/SentryError.h>
+#    import <Sentry/SentryEvent.h>
+#    import <Sentry/SentryException.h>
+#    import <Sentry/SentryFrame.h>
+#    import <Sentry/SentryGeo.h>
+#    import <Sentry/SentryHttpStatusCodeRange.h>
+#    import <Sentry/SentryHub.h>
+#    import <Sentry/SentryMeasurementUnit.h>
+#    import <Sentry/SentryMechanism.h>
+#    import <Sentry/SentryMechanismMeta.h>
+#    import <Sentry/SentryMessage.h>
+#    import <Sentry/SentryNSError.h>
+#    import <Sentry/SentryOptions.h>
+#    import <Sentry/SentryRequest.h>
+#    import <Sentry/SentrySDK.h>
+#    import <Sentry/SentrySampleDecision.h>
+#    import <Sentry/SentrySamplingContext.h>
+#    import <Sentry/SentryScope.h>
+#    import <Sentry/SentrySerializable.h>
+#    import <Sentry/SentrySpanContext.h>
+#    import <Sentry/SentrySpanId.h>
+#    import <Sentry/SentrySpanProtocol.h>
+#    import <Sentry/SentrySpanStatus.h>
+#    import <Sentry/SentryStacktrace.h>
+#    import <Sentry/SentryThread.h>
+#    import <Sentry/SentryTraceHeader.h>
+#    import <Sentry/SentryTransactionContext.h>
+#    import <Sentry/SentryUser.h>
+#    import <Sentry/SentryUserFeedback.h>
+#endif
diff --git a/Sources/Sentry/include/Sentry.private.modulemap b/Sources/Sentry/include/Sentry.private.modulemap
diff --git a/Sources/Sentry/include/SentryWithoutUIKit.private.modulemap b/Sources/Sentry/include/SentryWithoutUIKit.private.modulemap
diff --git a/Sources/Sentry/include/module.modulemap b/Sources/Sentry/include/module.modulemap
@@ -0,0 +1,3 @@
+module _SentryPrivate {
+    header "SentryPrivate.h"
+}