Skip to content

chore(ios): Changes required for XCode 14.3 #8746

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

Merged
mcdurdin merged 2 commits into from
May 16, 2023
Merged

chore(ios): Changes required for XCode 14.3 #8746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589e6b8
Changes required for XCode 14.3
davidmoore1 May 10, 2023
a4ae39c
chore make oem/firstvoices/ios/Cartfile consistent with ios/Cartfile
mcdurdin May 16, 2023
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
4 changes: 2 additions & 2 deletions ios/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "marmelroy/Zip"
github "DaveWoodCom/XCGLogger" ~> 6.1.0
github "keymanapp/dependency-XCGLogger" "master"
Copy link
Contributor

@darcywong00 darcywong00 May 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want a specific tag here? The latest looks to be 7.0.1 from Feb 2020

Copy link
Member

@mcdurdin mcdurdin May 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can stick with 'master' given we control the fork

Copy link
Member

@mcdurdin mcdurdin May 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You use 'master' here but 'head' in oem/firstvoices/ios/Cartfile?

github "keymanapp/dependency-XCGLogger" "master"

vs

github "keymanapp/dependency-XCGLogger" "head"

Can we use the same in both places please?

github "devicekit/DeviceKit" ~> 5.0
github "ashleymills/Reachability.swift"
github "getsentry/sentry-cocoa" ~> 6.2.1
github "getsentry/sentry-cocoa" ~> 8.7.0
4 changes: 2 additions & 2 deletions ios/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "DaveWoodCom/XCGLogger" "6.1.0"
github "ashleymills/Reachability.swift" "v5.1.0"
github "devicekit/DeviceKit" "5.0.0"
github "getsentry/sentry-cocoa" "6.2.1"
github "getsentry/sentry-cocoa" "8.7.0"
github "keymanapp/dependency-XCGLogger" "57a7b975dbb6fe4fe90cef3d1bc52b8adbd89113"
github "marmelroy/Zip" "2.1.2"
4 changes: 2 additions & 2 deletions ios/engine/KMEI/KeymanEngine/Classes/Errors/SentryManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public class SentryManager {
public static func breadcrumbAndLog(crumb: Sentry.Breadcrumb, logLevel: XCGLogger.Level? = nil) {
// Guarded in case a library consumer decides against initializing Sentry.
if _started {
SentrySDK.addBreadcrumb(crumb: crumb)
SentrySDK.addBreadcrumb(crumb)
}

let level = logLevel ?? mapLoggingLevel(crumb.level)
Expand All @@ -193,7 +193,7 @@ public class SentryManager {
}

public static func forceError() {
SentrySDK.addBreadcrumb(crumb: Sentry.Breadcrumb(level: .info, category: "Deliberate testing error"))
SentrySDK.addBreadcrumb(Sentry.Breadcrumb(level: .info, category: "Deliberate testing error"))
SentrySDK.crash()
}
}
4 changes: 2 additions & 2 deletions oem/firstvoices/ios/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "DaveWoodCom/XCGLogger" ~> 6.1.0
github "keymanapp/dependency-XCGLogger" "master"
github "devicekit/DeviceKit" ~> 5.0
github "ashleymills/Reachability.swift"
github "getsentry/sentry-cocoa" ~> 6.2.1
github "getsentry/sentry-cocoa" ~> 8.7.0
4 changes: 2 additions & 2 deletions oem/firstvoices/ios/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "DaveWoodCom/XCGLogger" "6.1.0"
github "ashleymills/Reachability.swift" "v5.1.0"
github "devicekit/DeviceKit" "5.0.0"
github "getsentry/sentry-cocoa" "6.2.1"
github "getsentry/sentry-cocoa" "8.7.0"
github "keymanapp/dependency-XCGLogger" "57a7b975dbb6fe4fe90cef3d1bc52b8adbd89113"