Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ run_version_bump_util_for_prs: &run_version_bump_util_for_prs
- "Sources/Configuration/SDK.xcconfig"
- "Sources/Configuration/Versioning.xcconfig"
- "Sources/Configuration/SentrySwiftUI.xcconfig"
- "Sources/Configuration/SentrySwiftLog.xcconfig"

run_ui_tests_for_prs: &run_ui_tests_for_prs
- "Sources/**"
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -355,16 +355,6 @@ jobs:
device: "iPhone 15 Pro"
scheme: "SentrySwiftUI"

# iOS 17 - Use pre-installed iOS 17.5 runtime on macOS-14 with Xcode 15.4
- name: iOS 17 SentrySwiftLog
runs-on: macos-14
xcode: "15.4"
test-destination-os: "17.5"
platform: "iOS"
create_device: true
device: "iPhone 15 Pro"
scheme: "SentrySwiftLog"

# tvOS 18
- name: tvOS 18 Sentry
runs-on: macos-15
Expand Down
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
This option is still disabled by default and will be enabled in a future major release.
- Move `enableDataSwizzling` from experimental options to top-level options (#6592). This option remains enabled by default.
- Add `sentry.replay_id` attribute to logs ([#6515](https://github.com/getsentry/sentry-cocoa/pull/6515))
- Structured Logs: Add `SentrySwiftLog` Integration (#6286)

## 9.0.0-alpha.0

Expand Down Expand Up @@ -127,7 +126,6 @@
This option is still disabled by default and will be enabled in a future major release.
- Move `enableDataSwizzling` from experimental options to top-level options (#6592). This option remains enabled by default.
- Add `sentry.replay_id` attribute to logs ([#6515](https://github.com/getsentry/sentry-cocoa/pull/6515))
- Structured Logs: Add `SentrySwiftLog` Integration (#6286)

## 8.57.2

Expand Down
19 changes: 2 additions & 17 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ var products: [Product] = [
.library(name: "Sentry-WithoutUIKitOrAppKit", targets: ["Sentry-WithoutUIKitOrAppKit", "SentryCppHelper"]),
.library(name: "Sentry-WithoutUIKitOrAppKit-WithARM64e", targets: ["Sentry-WithoutUIKitOrAppKit-WithARM64e", "SentryCppHelper"]),
.library(name: "SentrySwiftUI", targets: ["Sentry", "SentrySwiftUI", "SentryCppHelper"]),
.library(name: "SentryDistribution", targets: ["SentryDistribution"]),
.library(name: "SentrySwiftLog", targets: ["Sentry", "SentrySwiftLog"])
.library(name: "SentryDistribution", targets: ["SentryDistribution"])
]

var targets: [Target] = [
Expand Down Expand Up @@ -55,14 +54,6 @@ var targets: [Target] = [
.linkedFramework("Sentry")
]
),
.target(
name: "SentrySwiftLog",
dependencies: ["Sentry", .product(name: "Logging", package: "swift-log")],
path: "Sources/SentrySwiftLog",
linkerSettings: [
.linkedFramework("Sentry")
]
),
.target(
name: "SentryInternal",
path: "Sources/SentrySwiftUI",
Expand Down Expand Up @@ -112,7 +103,7 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" {
name: "SentryObjc",
dependencies: ["SentrySwift"],
path: "Sources",
exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "SentrySwiftLog", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"],
exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"],
cSettings: [
.headerSearchPath("Sentry/include/HybridPublic"),
.headerSearchPath("Sentry"),
Expand All @@ -129,12 +120,6 @@ let package = Package(
name: "Sentry",
platforms: [.iOS(.v15), .macOS(.v12), .tvOS(.v15), .watchOS(.v8)],
products: products,
dependencies: [
// SPM doesn't support peer-dependencies, so users are locked into our declared version.
// Using `from: "1.6.0"` covers 1.6.0 < 2.0.0, resolving minor versions automatically.
// See develop-docs/DECISIONS.md for discussion.
.package(url: "https://github.com/apple/swift-log", from: "1.6.0")
],
targets: targets,
cxxLanguageStandard: .cxx14
)
24 changes: 0 additions & 24 deletions Plans/SentrySwiftLog_Base.xctestplan

This file was deleted.

1 change: 0 additions & 1 deletion Samples/iOS-Swift/iOS-Swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ targets:
- target: iOS-SwiftClip
- target: SentrySampleShared/SentrySampleShared
- target: iOS-Swift-ShareExtension
- target: Sentry/SentrySwiftLog
configFiles:
Debug: iOS-Swift.xcconfig
Release: iOS-Swift.xcconfig
Expand Down
14 changes: 0 additions & 14 deletions Samples/iOS-Swift/iOS-Swift/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import SentrySampleShared
import UIKit

import Logging
import SentrySwiftLog

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
private var randomDistributionTimer: Timer?
Expand Down Expand Up @@ -32,17 +29,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
metricKit.receiveReports()
}

// Use structured logs with swift-log
LoggingSystem.bootstrap { _ in
return SentryLogHandler(logLevel: .trace)
}
let logger = Logger(label: "io.sentry.iOS-Swift")
logger.trace(
"[iOS-Swift] didFinishLaunchingWithOptions",
metadata: ["foo": "bar"],
source: "iOS"
)

return true
}

Expand Down
Loading
Loading