-
-
Notifications
You must be signed in to change notification settings - Fork 333
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: define separate module names for UIKitless configurations (#4140)
- Loading branch information
1 parent
d26797f
commit 5230990
Showing
21 changed files
with
263 additions
and
216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,21 @@ | ||
| PRODUCT_NAME = Sentry | ||
| INFOPLIST_FILE = Sources/Resources/Info.plist | ||
| PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry | ||
| #include "Versions.xcconfig" | ||
|
|
||
| CURRENT_PROJECT_VERSION = 8.30.0 | ||
| INFOPLIST_FILE = Sources/Resources/Info.plist | ||
|
|
||
| MODULEMAP_FILE = $(SRCROOT)/Sources/Resources/Sentry.modulemap | ||
| SENTRY_MODULE_NAME = Sentry | ||
| SENTRY_WITHOUT_UIKIT_MODULE_NAME = SentryWithoutUIKit | ||
|
|
||
| // This config is required so the test code can access the SentryPrivate module. Removing this setting | ||
| // leads to an error: no such module '_SentryPrivate' when including the XCFramework with Carthage | ||
| HEADER_SEARCH_PATHS = $(SRCROOT)/Sources/Sentry/include/** | ||
|
|
||
| PRODUCT_MODULE_NAME_Debug = $(SENTRY_MODULE_NAME) | ||
| PRODUCT_MODULE_NAME_DebugWithoutUIKit = $(SENTRY_WITHOUT_UIKIT_MODULE_NAME) | ||
| PRODUCT_MODULE_NAME_Test = $(SENTRY_MODULE_NAME) | ||
| PRODUCT_MODULE_NAME_TestCI = $(SENTRY_MODULE_NAME) | ||
| PRODUCT_MODULE_NAME_Release = $(SENTRY_MODULE_NAME) | ||
| PRODUCT_MODULE_NAME_ReleaseWithoutUIKit = $(SENTRY_WITHOUT_UIKIT_MODULE_NAME) | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| framework module SentryWithoutUIKit { | ||
| umbrella header "SentryWithoutUIKit.h" | ||
|
|
||
| export * | ||
| module * { export * } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,49 @@ | ||
| #import <Foundation/Foundation.h> | ||
| #if __has_include(<Sentry/Sentry.h>) | ||
| # import <Foundation/Foundation.h> | ||
|
|
||
| //! Project version number for Sentry. | ||
| 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> | ||
| # 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> | ||
| # import <Sentry/SentryWithoutUIKit.h> | ||
| #endif // __has_include(<Sentry/Sentry.h>) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #if __has_include(<SentryWithoutUIKit/Sentry.h>) | ||
| # import <Foundation/Foundation.h> | ||
|
|
||
| //! Project version number for Sentry. | ||
| FOUNDATION_EXPORT double SentryVersionNumber; | ||
|
|
||
| //! Project version string for Sentry. | ||
| FOUNDATION_EXPORT const unsigned char SentryVersionString[]; | ||
|
|
||
| # import <SentryWithoutUIKit/Sentry.h> | ||
| # 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> | ||
| #endif // __has_include(<SentryWithoutUIKit/Sentry.h>) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.