Skip to content

Commit cedb74c

Browse files
github-actions[bot]web-flowtustanivskynwhite-riotgetsentry-bot
authored
chore(deps): update Cocoa SDK (iOS and Mac) to v9.0.0 (#1161)
* chore: update modules/sentry-cocoa.properties to 9.0.0 * Update package snapshot * Fix compatibility issues with Cocoa SDK 9.0.0 (#1149) * Remove InAppExclude option as it's no longer supported by Cocoa SDK * Logs no longer experimental * Rename logs enum * Update changelog * Expose user consent API (#1139) * Expose user consent API * Format code * Add PR * Fix method name * Add `IsUserConsentRequired` implementation stubs for Android and Apple * Format code * Fix typo * Log message --------- Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: Ivan Tustanivskyi <[email protected]> * Fix envelope header init --------- Co-authored-by: nwhite-riot <[email protected]> Co-authored-by: Sentry Github Bot <[email protected]> --------- Co-authored-by: GitHub <[email protected]> Co-authored-by: Ivan Tustanivskyi <[email protected]> Co-authored-by: nwhite-riot <[email protected]> Co-authored-by: Sentry Github Bot <[email protected]>
1 parent 32e51dd commit cedb74c

File tree

8 files changed

+39
-55
lines changed

8 files changed

+39
-55
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
- No more warnings in UE 5.7 caused by deprecated API usage ([#1152](https://github.com/getsentry/sentry-unreal/pull/1152))
1212
- Custom tags are now correctly included in Android NDK crash events ([#1160](https://github.com/getsentry/sentry-unreal/pull/1160))
13+
- Fix compatibility issues with Cocoa SDK 9.0.0 ([#1149](https://github.com/getsentry/sentry-unreal/pull/1149))
1314

1415
### Dependencies
1516

@@ -28,6 +29,9 @@
2829
- Bump Java SDK (Android) from v8.25.0 to v8.27.1 ([#1147](https://github.com/getsentry/sentry-unreal/pull/1147), [#1156](https://github.com/getsentry/sentry-unreal/pull/1156), [#1159](https://github.com/getsentry/sentry-unreal/pull/1159))
2930
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8271)
3031
- [diff](https://github.com/getsentry/sentry-java/compare/8.25.0...8.27.1)
32+
- Bump Cocoa SDK (iOS and Mac) from v8.57.3 to v9.0.0 ([#1161](https://github.com/getsentry/sentry-unreal/pull/1161))
33+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#900)
34+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.3...9.0.0)
3135

3236
## 1.2.1
3337

‎modules/sentry-cocoa.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=8.57.3
1+
version=9.0.0
22
repo=https://github.com/getsentry/sentry-cocoa

‎plugin-dev/Source/Sentry/Private/Apple/AppleSentryLog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ FAppleSentryLog::FAppleSentryLog()
1515
LogApple.traceId = [[SENTRY_APPLE_CLASS(SentryId) alloc] init];
1616
LogApple.body = @"";
1717
LogApple.attributes = @{};
18-
LogApple.level = SentryStructuredLogLevelDebug;
18+
LogApple.level = SentryLogLevelDebug;
1919
}
2020

2121
FAppleSentryLog::FAppleSentryLog(SentryLog* log)
@@ -56,10 +56,10 @@ FString FAppleSentryLog::GetBody() const
5656

5757
void FAppleSentryLog::SetLevel(ESentryLevel level)
5858
{
59-
LogApple.level = FAppleSentryConverters::SentryStructuredLogLevelToNative(level);
59+
LogApple.level = FAppleSentryConverters::SentryLogLevelToNative(level);
6060
}
6161

6262
ESentryLevel FAppleSentryLog::GetLevel() const
6363
{
64-
return FAppleSentryConverters::SentryStructuredLogLevelToUnreal(LogApple.level);
64+
return FAppleSentryConverters::SentryLogLevelToUnreal(LogApple.level);
6565
}

‎plugin-dev/Source/Sentry/Private/Apple/AppleSentrySubsystem.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void FAppleSentrySubsystem::InitWithSettings(const USentrySettings* settings, US
6464
options.maxBreadcrumbs = settings->MaxBreadcrumbs;
6565
options.sendDefaultPii = settings->SendDefaultPii;
6666
options.maxAttachmentSize = settings->MaxAttachmentSize;
67-
options.experimental.enableLogs = settings->EnableStructuredLogging;
67+
options.enableLogs = settings->EnableStructuredLogging;
6868
#if SENTRY_UIKIT_AVAILABLE
6969
options.attachScreenshot = settings->AttachScreenshot;
7070
#endif
@@ -86,10 +86,6 @@ void FAppleSentrySubsystem::InitWithSettings(const USentrySettings* settings, US
8686
{
8787
[options addInAppInclude:it->GetNSString()];
8888
}
89-
for (auto it = settings->InAppExclude.CreateConstIterator(); it; ++it)
90-
{
91-
[options addInAppExclude:it->GetNSString()];
92-
}
9389
options.enableAppHangTracking = settings->EnableAppNotRespondingTracking;
9490
if (settings->EnableTracing && settings->SamplingType == ESentryTracesSamplingType::UniformSampleRate)
9591
{
@@ -505,7 +501,7 @@ void FAppleSentrySubsystem::UploadAttachmentForEvent(TSharedPtr<ISentryId> event
505501

506502
SentryId* id = StaticCastSharedPtr<FAppleSentryId>(eventId)->GetNativeObject();
507503

508-
SentryEnvelopeHeader* envelopeHeader = [[SENTRY_APPLE_CLASS(SentryEnvelopeHeader) alloc] initWithId:id sdkInfo:nil traceContext:nil];
504+
SentryEnvelopeHeader* envelopeHeader = [[SENTRY_APPLE_CLASS(SentryEnvelopeHeader) alloc] initWithId:id traceContext:nil];
509505

510506
SentryEnvelope* envelope = [[SENTRY_APPLE_CLASS(SentryEnvelope) alloc] initWithHeader:envelopeHeader singleItem:envelopeItem];
511507

‎plugin-dev/Source/Sentry/Private/Apple/Infrastructure/AppleSentryConverters.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ SentryLevel FAppleSentryConverters::SentryLevelToNative(ESentryLevel level)
3535
return nativeLevel;
3636
}
3737

38-
SentryStructuredLogLevel FAppleSentryConverters::SentryStructuredLogLevelToNative(ESentryLevel level)
38+
SentryLogLevel FAppleSentryConverters::SentryLogLevelToNative(ESentryLevel level)
3939
{
40-
SentryStructuredLogLevel nativeLevel = SentryStructuredLogLevelDebug;
40+
SentryLogLevel nativeLevel = SentryLogLevelDebug;
4141

4242
switch (level)
4343
{
4444
case ESentryLevel::Debug:
45-
nativeLevel = SentryStructuredLogLevelDebug;
45+
nativeLevel = SentryLogLevelDebug;
4646
break;
4747
case ESentryLevel::Info:
48-
nativeLevel = SentryStructuredLogLevelInfo;
48+
nativeLevel = SentryLogLevelInfo;
4949
break;
5050
case ESentryLevel::Warning:
51-
nativeLevel = SentryStructuredLogLevelWarn;
51+
nativeLevel = SentryLogLevelWarn;
5252
break;
5353
case ESentryLevel::Error:
54-
nativeLevel = SentryStructuredLogLevelError;
54+
nativeLevel = SentryLogLevelError;
5555
break;
5656
case ESentryLevel::Fatal:
57-
nativeLevel = SentryStructuredLogLevelFatal;
57+
nativeLevel = SentryLogLevelFatal;
5858
break;
5959
default:
6060
UE_LOG(LogSentrySdk, Warning, TEXT("Unknown Sentry level value used. Debug will be returned."));
@@ -183,26 +183,26 @@ ESentryLevel FAppleSentryConverters::SentryLevelToUnreal(SentryLevel level)
183183
return unrealLevel;
184184
}
185185

186-
ESentryLevel FAppleSentryConverters::SentryStructuredLogLevelToUnreal(SentryStructuredLogLevel level)
186+
ESentryLevel FAppleSentryConverters::SentryLogLevelToUnreal(SentryLogLevel level)
187187
{
188188
ESentryLevel unrealLevel = ESentryLevel::Debug;
189189

190190
switch (level)
191191
{
192-
case SentryStructuredLogLevelTrace:
193-
case SentryStructuredLogLevelDebug:
192+
case SentryLogLevelTrace:
193+
case SentryLogLevelDebug:
194194
unrealLevel = ESentryLevel::Debug;
195195
break;
196-
case SentryStructuredLogLevelInfo:
196+
case SentryLogLevelInfo:
197197
unrealLevel = ESentryLevel::Info;
198198
break;
199-
case SentryStructuredLogLevelWarn:
199+
case SentryLogLevelWarn:
200200
unrealLevel = ESentryLevel::Warning;
201201
break;
202-
case SentryStructuredLogLevelError:
202+
case SentryLogLevelError:
203203
unrealLevel = ESentryLevel::Error;
204204
break;
205-
case SentryStructuredLogLevelFatal:
205+
case SentryLogLevelFatal:
206206
unrealLevel = ESentryLevel::Fatal;
207207
break;
208208
default:

‎plugin-dev/Source/Sentry/Private/Apple/Infrastructure/AppleSentryConverters.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class FAppleSentryConverters
1616
public:
1717
/** Conversions to native Mac/iOS types */
1818
static SentryLevel SentryLevelToNative(ESentryLevel level);
19-
static SentryStructuredLogLevel SentryStructuredLogLevelToNative(ESentryLevel level);
19+
static SentryLogLevel SentryLogLevelToNative(ESentryLevel level);
2020
static NSDictionary* StringMapToNative(const TMap<FString, FString>& map);
2121
static NSArray* StringArrayToNative(const TArray<FString>& array);
2222
static NSData* ByteDataToNative(const TArray<uint8>& array);
@@ -27,7 +27,7 @@ class FAppleSentryConverters
2727

2828
/** Conversions from native Mac/iOS types */
2929
static ESentryLevel SentryLevelToUnreal(SentryLevel level);
30-
static ESentryLevel SentryStructuredLogLevelToUnreal(SentryStructuredLogLevel level);
30+
static ESentryLevel SentryLogLevelToUnreal(SentryLogLevel level);
3131
static TMap<FString, FString> StringMapToUnreal(NSDictionary* dict);
3232
static TArray<FString> StringArrayToUnreal(NSArray* array);
3333
static TArray<uint8> ByteDataToUnreal(NSData* data);

‎plugin-dev/Source/Sentry/Public/SentrySettings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class SENTRY_API USentrySettings : public UObject
339339
TArray<FString> InAppInclude;
340340

341341
UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Mobile",
342-
Meta = (DisplayName = "In-app excludes (for Android/Apple only)", Tooltip = "A list of string prefixes of module names that don't belong to the app."))
342+
Meta = (DisplayName = "In-app excludes (for Android only)", Tooltip = "A list of string prefixes of module names that don't belong to the app."))
343343
TArray<FString> InAppExclude;
344344

345345
UPROPERTY(Config, EditAnywhere, BlueprintReadWrite, Category = "General|Mobile",

‎scripts/packaging/package.snapshot‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -270,29 +270,23 @@ Source/ThirdParty/IOS/Sentry.framework/Headers/Sentry.h
270270
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryAttachment.h
271271
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryBaggage.h
272272
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryBreadcrumb.h
273-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryClient.h
274273
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryCrashExceptionApplication.h
275-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryDebugImageProvider.h
276274
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryDebugMeta.h
277275
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryDefines.h
278276
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryDsn.h
279-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryEnvelopeItemHeader.h
280277
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryError.h
281278
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryEvent.h
282279
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryException.h
283-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryFeedbackAPI.h
284280
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryFrame.h
285281
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryGeo.h
286282
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryHttpStatusCodeRange.h
287-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryHub.h
288-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryIntegrationProtocol.h
283+
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryId.h
284+
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryLevel.h
289285
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMeasurementUnit.h
290286
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMechanism.h
291-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMechanismMeta.h
287+
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMechanismContext.h
292288
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryMessage.h
293289
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryNSError.h
294-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryOptions.h
295-
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryProfilingConditionals.h
296290
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryReplayApi.h
297291
Source/ThirdParty/IOS/Sentry.framework/Headers/SentryRequest.h
298292
Source/ThirdParty/IOS/Sentry.framework/Headers/SentrySampleDecision.h
@@ -332,20 +326,18 @@ Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryCrashInstallationRep
332326
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryCrashReportConverter.h
333327
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryCrashReportSink.h
334328
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryDateUtils.h
335-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryDebugImageProvider+HybridSDKs.h
336-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryDependencyContainer.h
329+
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryDsn+Private.h
337330
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryFormatter.h
338-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryFramesTracker.h
331+
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryIntegrationProtocol.h
339332
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryInternalSerializable.h
340333
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryLogC.h
341334
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryNSDataUtils.h
342335
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryNSDictionarySanitize.h
343-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryOptions+Private.h
344336
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryOptionsInternal.h
337+
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryProfilingConditionals.h
345338
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryRequestOperation.h
346-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentryScreenFrames.h
347339
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySDK+Private.h
348-
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySessionReplayIntegration-Hybrid.h
340+
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySessionReplayHybridSDK.h
349341
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySessionReplayIntegration.h
350342
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySwift.h
351343
Source/ThirdParty/IOS/Sentry.framework/PrivateHeaders/SentrySwizzle.h
@@ -388,41 +380,34 @@ Source/ThirdParty/Mac/include/Sentry/SentryBaggage.h
388380
Source/ThirdParty/Mac/include/Sentry/SentryBaseIntegration.h
389381
Source/ThirdParty/Mac/include/Sentry/SentryBreadcrumb.h
390382
Source/ThirdParty/Mac/include/Sentry/SentryBreadcrumb+Private.h
391-
Source/ThirdParty/Mac/include/Sentry/SentryClient.h
392383
Source/ThirdParty/Mac/include/Sentry/SentryCrashExceptionApplication.h
393384
Source/ThirdParty/Mac/include/Sentry/SentryCrashInstallationReporter.h
394385
Source/ThirdParty/Mac/include/Sentry/SentryCrashReportConverter.h
395386
Source/ThirdParty/Mac/include/Sentry/SentryCrashReportSink.h
396387
Source/ThirdParty/Mac/include/Sentry/SentryDateUtils.h
397-
Source/ThirdParty/Mac/include/Sentry/SentryDebugImageProvider.h
398-
Source/ThirdParty/Mac/include/Sentry/SentryDebugImageProvider+HybridSDKs.h
399388
Source/ThirdParty/Mac/include/Sentry/SentryDebugMeta.h
400389
Source/ThirdParty/Mac/include/Sentry/SentryDefines.h
401-
Source/ThirdParty/Mac/include/Sentry/SentryDependencyContainer.h
402390
Source/ThirdParty/Mac/include/Sentry/SentryDsn.h
403-
Source/ThirdParty/Mac/include/Sentry/SentryEnvelopeItemHeader.h
391+
Source/ThirdParty/Mac/include/Sentry/SentryDsn+Private.h
404392
Source/ThirdParty/Mac/include/Sentry/SentryError.h
405393
Source/ThirdParty/Mac/include/Sentry/SentryEvent.h
406394
Source/ThirdParty/Mac/include/Sentry/SentryException.h
407-
Source/ThirdParty/Mac/include/Sentry/SentryFeedbackAPI.h
408395
Source/ThirdParty/Mac/include/Sentry/SentryFormatter.h
409396
Source/ThirdParty/Mac/include/Sentry/SentryFrame.h
410-
Source/ThirdParty/Mac/include/Sentry/SentryFramesTracker.h
411397
Source/ThirdParty/Mac/include/Sentry/SentryGeo.h
412398
Source/ThirdParty/Mac/include/Sentry/SentryHttpStatusCodeRange.h
413-
Source/ThirdParty/Mac/include/Sentry/SentryHub.h
399+
Source/ThirdParty/Mac/include/Sentry/SentryId.h
414400
Source/ThirdParty/Mac/include/Sentry/SentryIntegrationProtocol.h
415401
Source/ThirdParty/Mac/include/Sentry/SentryInternalSerializable.h
402+
Source/ThirdParty/Mac/include/Sentry/SentryLevel.h
416403
Source/ThirdParty/Mac/include/Sentry/SentryLogC.h
417404
Source/ThirdParty/Mac/include/Sentry/SentryMeasurementUnit.h
418405
Source/ThirdParty/Mac/include/Sentry/SentryMechanism.h
419-
Source/ThirdParty/Mac/include/Sentry/SentryMechanismMeta.h
406+
Source/ThirdParty/Mac/include/Sentry/SentryMechanismContext.h
420407
Source/ThirdParty/Mac/include/Sentry/SentryMessage.h
421408
Source/ThirdParty/Mac/include/Sentry/SentryNSDataUtils.h
422409
Source/ThirdParty/Mac/include/Sentry/SentryNSDictionarySanitize.h
423410
Source/ThirdParty/Mac/include/Sentry/SentryNSError.h
424-
Source/ThirdParty/Mac/include/Sentry/SentryOptions.h
425-
Source/ThirdParty/Mac/include/Sentry/SentryOptions+Private.h
426411
Source/ThirdParty/Mac/include/Sentry/SentryOptionsInternal.h
427412
Source/ThirdParty/Mac/include/Sentry/SentryProfilingConditionals.h
428413
Source/ThirdParty/Mac/include/Sentry/SentryReplayApi.h
@@ -431,10 +416,9 @@ Source/ThirdParty/Mac/include/Sentry/SentryRequestOperation.h
431416
Source/ThirdParty/Mac/include/Sentry/SentrySampleDecision.h
432417
Source/ThirdParty/Mac/include/Sentry/SentrySamplingContext.h
433418
Source/ThirdParty/Mac/include/Sentry/SentryScope.h
434-
Source/ThirdParty/Mac/include/Sentry/SentryScreenFrames.h
435419
Source/ThirdParty/Mac/include/Sentry/SentrySDK+Private.h
436420
Source/ThirdParty/Mac/include/Sentry/SentrySerializable.h
437-
Source/ThirdParty/Mac/include/Sentry/SentrySessionReplayIntegration-Hybrid.h
421+
Source/ThirdParty/Mac/include/Sentry/SentrySessionReplayHybridSDK.h
438422
Source/ThirdParty/Mac/include/Sentry/SentrySessionReplayIntegration.h
439423
Source/ThirdParty/Mac/include/Sentry/SentrySpanContext.h
440424
Source/ThirdParty/Mac/include/Sentry/SentrySpanId.h

0 commit comments

Comments
 (0)