Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Easy use of Swift classes in Objective-C projects #4585

Closed
wants to merge 16 commits into from
Closed

Fix: Easy use of Swift classes in Objective-C projects #4585

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
45051d2
fix: Exposing Swift to Objc
brustolin Nov 29, 2024
d49a897
Update CHANGELOG.md
brustolin Nov 29, 2024
9b1110b
Update CHANGELOG.md
brustolin Nov 29, 2024
f7bb137
Merge branch 'main' into fix/easy-swift-objc
brustolin Nov 29, 2024
92e5406
Format code
getsentry-bot Nov 29, 2024
3d1eefa
Update CHANGELOG.md
brustolin Nov 29, 2024
4beb23d
Update AppDelegate.m
brustolin Nov 29, 2024
8d4eeeb
Update SentryWithoutUIKit.h
brustolin Nov 29, 2024
e505cad
Update build.yml
brustolin Nov 29, 2024
1de1e30
wip
brustolin Dec 3, 2024
d9640b5
Update AppDelegate.m
brustolin Dec 3, 2024
27cb6eb
wip
brustolin Dec 3, 2024
7ac9d69
Merge branch 'main' into fix/easy-swift-objc
brustolin Dec 3, 2024
921f562
Format code
getsentry-bot Dec 3, 2024
c7624bc
revert
brustolin Dec 3, 2024
ca9343d
Merge branch 'fix/easy-swift-objc' of https://github.com/getsentry/se…
brustolin Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Use `options.reportAccessibilityIdentifier` for Breadcrumbs and UIEvents (#4569)
- Session replay transformed view masking (#4529)
- Load integration from same binary (#4541)

- Easy use of Swift classes in Objective-C projects ()
brustolin marked this conversation as resolved.
Show resolved Hide resolved

### Improvements

Expand Down
4 changes: 2 additions & 2 deletions Sentry.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@
D8B665BC2B95F73200BD0E7B /* SentryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B665BA2B95F54200BD0E7B /* SentryPrivate.h */; };
D8B76B062808066D000A58C4 /* SentryScreenshotIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B76B042808060E000A58C4 /* SentryScreenshotIntegrationTests.swift */; };
D8B76B0828081461000A58C4 /* TestSentryScreenShot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B76B0728081461000A58C4 /* TestSentryScreenShot.swift */; };
D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BBD32628FD9FBF0011F850 /* SentrySwift.h */; settings = {ATTRIBUTES = (Private, ); }; };
D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BBD32628FD9FBF0011F850 /* SentrySwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
D8BC28C82BFF5EBB0054DA4D /* SentryTouchTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8BC28C72BFF5EBB0054DA4D /* SentryTouchTracker.swift */; };
D8BC28CA2BFF68CA0054DA4D /* NumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8BC28C92BFF68CA0054DA4D /* NumberExtensions.swift */; };
D8BC28CC2BFF78220054DA4D /* SentryRRWebTouchEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8BC28CB2BFF78220054DA4D /* SentryRRWebTouchEvent.swift */; };
Expand Down Expand Up @@ -1983,7 +1983,7 @@
D8B665BB2B95F5A100BD0E7B /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = Sources/Sentry/include/module.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>"; };
D8BBD32628FD9FBF0011F850 /* SentrySwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentrySwift.h; path = Public/SentrySwift.h; sourceTree = "<group>"; };
D8BC28C72BFF5EBB0054DA4D /* SentryTouchTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTouchTracker.swift; sourceTree = "<group>"; };
D8BC28C92BFF68CA0054DA4D /* NumberExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberExtensions.swift; sourceTree = "<group>"; };
D8BC28CB2BFF78220054DA4D /* SentryRRWebTouchEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRRWebTouchEvent.swift; sourceTree = "<group>"; };
Expand Down
2 changes: 2 additions & 0 deletions Sources/Sentry/Public/Sentry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
# import <Sentry/SentryUser.h>
# import <Sentry/SentryUserFeedback.h>
# import <Sentry/SentryWithoutUIKit.h>
# import <Sentry/SentrySwift.h>

#endif // __has_include(<Sentry/Sentry.h>)
4 changes: 2 additions & 2 deletions Sources/Sentry/include/SentrySwift.h → Sources/Sentry/Public/SentrySwift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#if __has_include(<SentryWithoutUIKit/Sentry.h>)
# if __has_include("SentryWithoutUIKit-Swift.h")
# import "SentryWithoutUIKit-Swift.h"
# else
# elif __has_include(<SentryWithoutUIKit/SentryWithoutUIKit-Swift.h>)
# import <SentryWithoutUIKit/SentryWithoutUIKit-Swift.h>
# endif
#else // !__has_include(<SentryWithoutUIKit/Sentry.h>)
Expand All @@ -31,7 +31,7 @@

# if __has_include("Sentry-Swift.h")
# import "Sentry-Swift.h"
# else
# elif __has_include(<Sentry/Sentry-Swift.h>)
# import <Sentry/Sentry-Swift.h>
# endif
#endif // __has_include(<SentryWithoutUIKit/Sentry.h>)
Expand Down