Skip to content

Commit 3a03a07

Browse files
committed
fix sentry sdk upgrade build breaks
1 parent 505c0e2 commit 3a03a07

File tree

8 files changed

+16
-34
lines changed

8 files changed

+16
-34
lines changed

apple/Inline.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@
14571457
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
14581458
requirement = {
14591459
kind = upToNextMajorVersion;
1460-
minimumVersion = 8.57.3;
1460+
minimumVersion = 9.5.1;
14611461
};
14621462
};
14631463
C35092D32CAEE8EA00AE3E23 /* XCRemoteSwiftPackageReference "keychain-swift" */ = {

apple/Inline.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apple/InlineKit/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apple/InlineKit/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ let package = Package(
4444
dependencies: [
4545
.package(url: "https://github.com/inline-chat/GRDB.swift", from: "7.10.0"),
4646
.package(url: "https://github.com/inline-chat/GRDBQuery", from: "0.11.5"),
47-
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.57.3"),
47+
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.5.1"),
4848
.package(url: "https://github.com/evgenyneu/keychain-swift.git", from: "24.0.0"),
4949
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.28.2"),
5050
.package(url: "https://github.com/Kuniwak/MultipartFormDataKit", from: "1.0.0"),

apple/InlineKit/Sources/InlineKit/Analytics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public final class Analytics: Sendable {
2828
options.debug = false
2929
options.tracesSampleRate = 0.1
3030
options.swiftAsyncStacktraces = true
31-
options.experimental.enableLogs = true
31+
options.enableLogs = true
3232
}
3333

3434
Log.shared.info("Analytics: starting")

apple/InlineKit/Sources/Logger/Logger.swift

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ public enum LogLevel: String, Sendable {
1919
}
2020
}
2121

22-
var sentryLevel: SentryLevel {
23-
switch self {
24-
case .error: .error
25-
case .warning: .warning
26-
case .info: .info
27-
case .debug: .debug
28-
case .trace: .debug
29-
}
30-
}
31-
3222
var priority: Int {
3323
switch self {
3424
case .trace: 0
@@ -112,8 +102,6 @@ public final class Log: @unchecked Sendable {
112102
)
113103
// #endif
114104

115-
let level_ = level
116-
117105
if level == .info {
118106
SentrySDK.logger.info(logMessage)
119107
}
@@ -126,7 +114,6 @@ public final class Log: @unchecked Sendable {
126114
error,
127115
message: message,
128116
scope: scope_,
129-
level: level_,
130117
file: file,
131118
function: function,
132119
line: line
@@ -135,7 +122,6 @@ public final class Log: @unchecked Sendable {
135122
await SentryReporter.shared.reportMessage(
136123
message,
137124
scope: scope_,
138-
level: level_,
139125
error: error,
140126
file: file,
141127
function: function,
@@ -208,14 +194,12 @@ private actor SentryReporter {
208194
_ error: Error,
209195
message: String,
210196
scope: String,
211-
level: LogLevel,
212197
file: String = #file,
213198
function: String = #function,
214199
line: Int = #line
215200
) async {
216201
await MainActor.run {
217-
SentrySDK.capture(error: error) { sentryScope in
218-
sentryScope.setLevel(level.sentryLevel)
202+
_ = SentrySDK.capture(error: error) { sentryScope in
219203
sentryScope.setTag(value: scope, key: "scope")
220204
sentryScope.setExtra(value: message, key: "message")
221205
sentryScope.setExtra(value: file, key: "file")
@@ -228,15 +212,13 @@ private actor SentryReporter {
228212
func reportMessage(
229213
_ message: String,
230214
scope: String,
231-
level: LogLevel,
232215
error: Error?,
233216
file: String = #file,
234217
function: String = #function,
235218
line: Int = #line
236219
) async {
237220
await MainActor.run {
238-
SentrySDK.capture(message: message) { sentryScope in
239-
sentryScope.setLevel(level.sentryLevel)
221+
_ = SentrySDK.capture(message: message) { sentryScope in
240222
sentryScope.setTag(value: scope, key: "scope")
241223
sentryScope.setExtra(value: file, key: "file")
242224
sentryScope.setExtra(value: function, key: "function")

apple/InlineMacUI/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apple/InlineUI/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)