Skip to content

Commit 5b90eb2

Browse files
noahsmartinnoahsmartin
authored
ref: Remove SentryIntegrationProtocol from public API (#6660)
1 parent d4a8572 commit 5b90eb2

File tree

8 files changed

+6
-117
lines changed

8 files changed

+6
-117
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Removes `defaultIntegrations` function from `SentryOptions` (#6664)
1919
- Makes `SentryEventDecodable` internal (#5808)
2020
- The `span` property on `SentryScope` is now readonly (#5866)
21+
- Removes `SentryIntegrationProtocol` from the API. This is not used after the removal of the `integrations` property (#6660)
2122
- Removes deprecated SentryDebugImageProvider class (#5598)
2223
- Properties on SentryOptions that had no effect on the WithoutUIKit variant are now removed from the API (#6644)
2324
- Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)

‎Sentry.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@
10351035
F4FE9DFE2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FE9DFC2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift */; };
10361036
F4FE9E082E6248E40014FED5 /* SentryCrashWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FE9E072E6248E40014FED5 /* SentryCrashWrapper.swift */; };
10371037
FA01BCB22E69352A00968DFA /* SentryDiscardedEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA01BCB12E69352A00968DFA /* SentryDiscardedEvent.swift */; };
1038-
FA034AC82DD3DB4900FE3107 /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
1038+
FA034AC82DD3DB4900FE3107 /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
10391039
FA1841832E4B457F005DEDC7 /* SentryApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA18417D2E4B457B005DEDC7 /* SentryApplication.swift */; };
10401040
FA21A2EF2E60E9CB00E7EADB /* EnvelopeComparison.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA21A2E92E60E9C700E7EADB /* EnvelopeComparison.swift */; };
10411041
FA21F0B42E4A2A80008B4E5A /* SentryAppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA4C32972DF7513F001D7B01 /* SentryAppState.swift */; };
@@ -2419,7 +2419,7 @@
24192419
F4FE9DFC2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryObjCRuntimeWrapper.swift; sourceTree = "<group>"; };
24202420
F4FE9E072E6248E40014FED5 /* SentryCrashWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashWrapper.swift; sourceTree = "<group>"; };
24212421
FA01BCB12E69352A00968DFA /* SentryDiscardedEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDiscardedEvent.swift; sourceTree = "<group>"; };
2422-
FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
2422+
FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = include/HybridPublic/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
24232423
FA18417D2E4B457B005DEDC7 /* SentryApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryApplication.swift; sourceTree = "<group>"; };
24242424
FA21A2E92E60E9C700E7EADB /* EnvelopeComparison.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvelopeComparison.swift; sourceTree = "<group>"; };
24252425
FA27EBDB2EB639D100F2ECF7 /* SentryId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryId.h; path = Public/SentryId.h; sourceTree = "<group>"; };

‎Sources/Resources/Sentry.modulemap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ framework module Sentry {
1515
header "SentrySwizzle.h"
1616
header "SentryUser+Private.h"
1717

18+
header "SentryIntegrationProtocol.h"
1819
header "SentryBaseIntegration.h"
1920
header "SentrySessionReplayIntegration.h"
2021
header "SentrySessionReplayIntegration-Hybrid.h"

‎Sources/Sentry/Public/Sentry.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
2323
# import <Sentry/SentryGeo.h>
2424
# import <Sentry/SentryHttpStatusCodeRange.h>
2525
# import <Sentry/SentryId.h>
26-
# import <Sentry/SentryIntegrationProtocol.h>
2726
# import <Sentry/SentryMeasurementUnit.h>
2827
# import <Sentry/SentryMechanism.h>
2928
# import <Sentry/SentryMechanismContext.h>

‎Sources/Sentry/Public/SentryWithoutUIKit.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
2424
# import <SentryWithoutUIKit/SentryGeo.h>
2525
# import <SentryWithoutUIKit/SentryHttpStatusCodeRange.h>
2626
# import <SentryWithoutUIKit/SentryId.h>
27-
# import <SentryWithoutUIKit/SentryIntegrationProtocol.h>
2827
# import <SentryWithoutUIKit/SentryMeasurementUnit.h>
2928
# import <SentryWithoutUIKit/SentryMechanism.h>
3029
# import <SentryWithoutUIKit/SentryMechanismContext.h>

‎Sources/Sentry/Public/SentryIntegrationProtocol.h‎ renamed to ‎Sources/Sentry/include/HybridPublic/SentryIntegrationProtocol.h‎

File renamed without changes.

‎Tests/DuplicatedSDKTest/DuplicatedSDKTest/DuplicatedSDKTest-Bridging-Header.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Added to run integration tests, do not attempt this in your app
55
@interface SentryHubInternal : NSObject
66

7-
@property (nonatomic, strong) NSMutableArray<id<SentryIntegrationProtocol>> *installedIntegrations;
7+
@property (nonatomic, strong) NSMutableArray<NSObject *> *installedIntegrations;
88

99
@end
1010

@@ -16,6 +16,6 @@
1616

1717
@interface SentryHub (DuplicatedSDKTest)
1818

19-
@property (nonatomic, strong) NSMutableArray<id<SentryIntegrationProtocol>> *installedIntegrations;
19+
@property (nonatomic, strong) NSMutableArray<NSObject *> *installedIntegrations;
2020

2121
@end

‎sdk_api.json‎

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,6 @@
174174
"Exported"
175175
]
176176
},
177-
{
178-
"kind": "Import",
179-
"name": "Sentry.SentryIntegrationProtocol",
180-
"printedName": "Sentry.SentryIntegrationProtocol",
181-
"declKind": "Import",
182-
"moduleName": "Sentry",
183-
"declAttributes": [
184-
"Exported"
185-
]
186-
},
187177
{
188178
"kind": "Import",
189179
"name": "Sentry.SentryMeasurementUnit",
@@ -26310,107 +26300,6 @@
2631026300
}
2631126301
]
2631226302
},
26313-
{
26314-
"kind": "TypeDecl",
26315-
"name": "SentryIntegrationProtocol",
26316-
"printedName": "SentryIntegrationProtocol",
26317-
"children": [
26318-
{
26319-
"kind": "Function",
26320-
"name": "install",
26321-
"printedName": "install(with:)",
26322-
"children": [
26323-
{
26324-
"kind": "TypeNominal",
26325-
"name": "Bool",
26326-
"printedName": "Swift.Bool",
26327-
"usr": "s:Sb"
26328-
},
26329-
{
26330-
"kind": "TypeNominal",
26331-
"name": "Options",
26332-
"printedName": "Sentry.Options",
26333-
"usr": "c:objc(cs)SentryOptions"
26334-
}
26335-
],
26336-
"declKind": "Func",
26337-
"usr": "c:objc(pl)SentryIntegrationProtocol(im)installWithOptions:",
26338-
"moduleName": "Sentry",
26339-
"genericSig": "<Self where Self : Sentry.SentryIntegrationProtocol>",
26340-
"protocolReq": true,
26341-
"objc_name": "installWithOptions:",
26342-
"declAttributes": [
26343-
"DiscardableResult",
26344-
"ObjC",
26345-
"Dynamic"
26346-
],
26347-
"reqNewWitnessTableEntry": true,
26348-
"funcSelfKind": "NonMutating"
26349-
},
26350-
{
26351-
"kind": "Function",
26352-
"name": "uninstall",
26353-
"printedName": "uninstall()",
26354-
"children": [
26355-
{
26356-
"kind": "TypeNameAlias",
26357-
"name": "Void",
26358-
"printedName": "Swift.Void",
26359-
"children": [
26360-
{
26361-
"kind": "TypeNominal",
26362-
"name": "Void",
26363-
"printedName": "()"
26364-
}
26365-
]
26366-
}
26367-
],
26368-
"declKind": "Func",
26369-
"usr": "c:objc(pl)SentryIntegrationProtocol(im)uninstall",
26370-
"moduleName": "Sentry",
26371-
"genericSig": "<Self where Self : Sentry.SentryIntegrationProtocol>",
26372-
"protocolReq": true,
26373-
"objc_name": "uninstall",
26374-
"declAttributes": [
26375-
"ObjC",
26376-
"Dynamic"
26377-
],
26378-
"reqNewWitnessTableEntry": true,
26379-
"funcSelfKind": "NonMutating"
26380-
}
26381-
],
26382-
"declKind": "Protocol",
26383-
"usr": "c:objc(pl)SentryIntegrationProtocol",
26384-
"moduleName": "Sentry",
26385-
"genericSig": "<Self : ObjectiveC.NSObjectProtocol>",
26386-
"objc_name": "SentryIntegrationProtocol",
26387-
"declAttributes": [
26388-
"ObjC",
26389-
"Dynamic"
26390-
],
26391-
"conformances": [
26392-
{
26393-
"kind": "Conformance",
26394-
"name": "Escapable",
26395-
"printedName": "Escapable",
26396-
"usr": "s:s9EscapableP",
26397-
"mangledName": "$ss9EscapableP"
26398-
},
26399-
{
26400-
"kind": "Conformance",
26401-
"name": "Copyable",
26402-
"printedName": "Copyable",
26403-
"usr": "s:s8CopyableP",
26404-
"mangledName": "$ss8CopyableP"
26405-
},
26406-
{
26407-
"kind": "Conformance",
26408-
"name": "NSObjectProtocol",
26409-
"printedName": "NSObjectProtocol",
26410-
"usr": "c:objc(pl)NSObject"
26411-
}
26412-
]
26413-
},
2641426303
{
2641526304
"kind": "TypeDecl",
2641626305
"name": "SentryMessage",

0 commit comments

Comments
 (0)