Merge branch 'main' into alwx/fix/set_output

Author: alwx

.github/last-release-runid

@@ -1 +1 @@
-21672561109
+21914154556

.github/workflows/cocoapods-keepalive.yml

@@ -0,0 +1,25 @@
+name: "CocoaPods Token Keep-Alive"
+
+on:
+  schedule:
+    # CocoaPods sessions currently expire after 3 days of inactivity (VALIDITY_LENGTH)
+    # This runs every day at midnight UTC to keep the current token alive
+    # See: https://github.com/CocoaPods/trunk.cocoapods.org/blob/a1869790e9ae2229b6985b6af4532da814202558/app/models/session.rb#L9
+    - cron: "0 0 * * *" # Runs every day at midnight UTC
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  keepalive:
+    name: Refresh CocoaPods Session
+    runs-on: macos-15
+    env:
+      COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+
+    steps:
+      - name: Install CocoaPods
+        run: gem install cocoapods
+      - name: Refresh CocoaPods Session
+        run: pod trunk me > /dev/null 2>&1

.github/workflows/test.yml

@@ -250,7 +250,7 @@ jobs:
       test-destination-os: ${{matrix.test-destination-os || 'latest'}}
       timeout: ${{matrix.timeout || 20}}
       device: ${{matrix.device || ''}}
-      scheme: ${{matrix.scheme || 'Sentry'}}
+      scheme: "Sentry"
       run_on_cirrus_labs: true # We always run tests on Cirrus Labs
     strategy:
       fail-fast: false
@@ -266,7 +266,6 @@ jobs:
             test-destination-os: "17.5"
             platform: "iOS"
             device: "iPhone 15 Pro"
-            scheme: "Sentry"
 
           # iOS 18
           - name: iOS 18 Sentry
@@ -275,7 +274,6 @@ jobs:
             test-destination-os: "18.5"
             platform: "iOS"
             device: "iPhone 16 Pro"
-            scheme: "Sentry"
 
           # iOS 26
           - name: iOS 26 Sentry
@@ -284,7 +282,6 @@ jobs:
             test-destination-os: "26.1"
             platform: "iOS"
             device: "iPhone 17 Pro"
-            scheme: "Sentry"
 
           # We don't run the unit tests on macOS 13 cause we run them on all on GH actions available iOS versions.
           # The chance of missing a bug solely on tvOS 16 that doesn't occur on iOS, macOS 12 or macOS 14 is minimal.
@@ -296,23 +293,20 @@ jobs:
             xcode: "16.1"
             test-destination-os: "latest"
             platform: "macOS"
-            scheme: "Sentry"
 
           # macOS 15
           - name: macOS 15 Sentry
             runs-on: sequoia
             xcode: "16.4"
             test-destination-os: "latest"
             platform: "macOS"
-            scheme: "Sentry"
 
           # macOS 26
           - name: macOS 26 Sentry
             runs-on: tahoe
             xcode: "26.1.1"
             test-destination-os: "26.1"
             platform: "macOS"
-            scheme: "Sentry"
 
           # Catalyst. We test the latest version, as the risk something breaking on Catalyst and not
           # on an older iOS or macOS version is low.
@@ -322,14 +316,12 @@ jobs:
             xcode: "16.1"
             test-destination-os: "latest"
             platform: "Catalyst"
-            scheme: "Sentry"
 
           - name: Catalyst 15 Sentry
             runs-on: sequoia
             xcode: "16.4"
             test-destination-os: "latest"
             platform: "Catalyst"
-            scheme: "Sentry"
 
           ## We don't run unit tests on macCatalyst 26 yet because of https://github.com/getsentry/sentry-cocoa/issues/6165.
 
@@ -343,24 +335,13 @@ jobs:
             xcode: "16.4"
             test-destination-os: "17.5"
             platform: "tvOS"
-            scheme: "Sentry"
-
-          # iOS 17 - SwiftUI
-          - name: iOS 17 SentrySwiftUI
-            runs-on: sequoia
-            xcode: "16.4"
-            test-destination-os: "17.5"
-            platform: "iOS"
-            device: "iPhone 15 Pro"
-            scheme: "SentrySwiftUI"
 
           # tvOS 18
           - name: tvOS 18 Sentry
             runs-on: sequoia
             xcode: "16.4"
             test-destination-os: "18.5"
             platform: "tvOS"
-            scheme: "Sentry"
 
           # tvOS 26
           - name: tvOS 26 Sentry
@@ -369,15 +350,13 @@ jobs:
             test-destination-os: "26.1"
             platform: "tvOS"
             device: "Apple TV"
-            scheme: "Sentry"
 
           # visionOS 26
           - name: visionOS 26 Sentry
             runs-on: tahoe
             xcode: "26.1.1"
             test-destination-os: "26.1"
             platform: "visionOS"
-            scheme: "Sentry"
             device: "Apple Vision Pro"
             timeout: 30
 

.swiftlint.yml

@@ -1,6 +1,7 @@
 excluded:
   - Pods
   - Utils/**/.build
+  - "**/build/**"
   - DependencyManagerTests
   - Sources/SentryCrash
   - vendor

3rd-party-integrations/SentryCocoaLumberjack/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack", from: "3.8.0"),
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.0")
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.1")
     ],
     targets: [
         .target(

3rd-party-integrations/SentryPulse/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/kean/Pulse", from: "5.0.0"),
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.0")
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.1")
     ],
     targets: [
         .target(

3rd-party-integrations/SentrySwiftLog/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-log", from: "1.5.0"),
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.0")
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.1")
     ],
     targets: [
         .target(

3rd-party-integrations/SentrySwiftyBeaver/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.0"),
+        .package(url: "https://github.com/getsentry/sentry-cocoa", from: "9.4.1"),
         .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", from: "2.0.0")
     ],
     targets: [

CHANGELOG.md

@@ -1,15 +1,26 @@
 # Changelog
 
+## 9.4.1
+
+### Improvements
+
+- Record client report when dropping in `beforeSendLog` (#7379)
+
+### Fixes
+
+- Cleanup SessionReplay when maximum duration reached (#7421)
+- Fix App hangs report with high durations (#7354)
+
+### Deprecations
+
+- The `SentrySwiftUI` module is now deprecated. All SwiftUI APIs (`SentryTracedView`, `sentryTrace()`, `sentryReplayMask()`, `sentryReplayUnmask()`) have been merged into the main `Sentry` module. You can replace `import SentrySwiftUI` with `import Sentry` in your code. The `SentrySwiftUI` module still works via a re-export but will be removed in the next major version. (#7422)
+
 ## 9.4.0
 
 ### Breaking Changes
 
 - `Sentry.metrics.count(..)` does not support units, therefore the API was incorrectly defined. This breaking change applies to a method marked as experimental. (#7358)
 
-### Improvements
-
-- Record client report when dropping in `beforeSendLog` (#7379)
-
 ### Fixes
 
 - Fix mismatch of `in_foreground` app context (#7188) The app context `in_foreground` for handled and unhandled events was sometimes different. This is fixed now by aligning the implementation and adding a new `is_active` app context field.

Package.swift

@@ -22,46 +22,38 @@ var products: [Product] = [
 var targets: [Target] = [
     .binaryTarget(
         name: "Sentry",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.0/Sentry.xcframework.zip",
-        checksum: "c0af612b43a4eacab4d38bda0a65b7a310295b3daadb95df2aa8251a9f6bdf6d" //Sentry-Static
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.1/Sentry.xcframework.zip",
+        checksum: "c8249364e3c295b569ec9858a908ec0a262e56cdfe187e7e318ef2f6a88a963b" //Sentry-Static
     ),
     .binaryTarget(
         name: "Sentry-Dynamic",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.0/Sentry-Dynamic.xcframework.zip",
-        checksum: "05f6925c228021e9e2bbdc9b609602de18a30f8192cba88d11aafb867ae24a5e" //Sentry-Dynamic
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.1/Sentry-Dynamic.xcframework.zip",
+        checksum: "74cb68d960512fa561f2e1c1e50d2f06d52aef4cb8a17ab6da09a07bc790989c" //Sentry-Dynamic
     ),
     .binaryTarget(
         name: "Sentry-Dynamic-WithARM64e",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
-        checksum: "e351c4f85ae32e9180ceea4e8a3f470b44148658ba7e119fd4df7548afedca45" //Sentry-Dynamic-WithARM64e
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.1/Sentry-Dynamic-WithARM64e.xcframework.zip",
+        checksum: "8ae29517e9fc73c5df93182df7cf192ef726c3be89cd6d7082f222430868c964" //Sentry-Dynamic-WithARM64e
     ),
     .binaryTarget(
         name: "Sentry-WithoutUIKitOrAppKit",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
-        checksum: "993d0e3cc5530e4b22737eb4aeeae1a84ad9182e8df958160e3e8ec1a8a4b5f0" //Sentry-WithoutUIKitOrAppKit
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.1/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
+        checksum: "0da743301299ea45fb1c5959f2526319bf9b6ed020c8bd7c5065ce15e5909ebf" //Sentry-WithoutUIKitOrAppKit
     ),
     .binaryTarget(
         name: "Sentry-WithoutUIKitOrAppKit-WithARM64e",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
-        checksum: "70d0b5865e9ffb7c9f1c1f5bd0511cd8ffd335da895c5ad17ebc250c9d9694b6" //Sentry-WithoutUIKitOrAppKit-WithARM64e
+        url: "https://github.com/getsentry/sentry-cocoa/releases/download/9.4.1/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
+        checksum: "1539782ee6eec23be42c1c226e81640a8c1d98e3824caccb73ee06d9ebe565fd" //Sentry-WithoutUIKitOrAppKit-WithARM64e
     ),
     .target(
         name: "SentrySwiftUI",
-        dependencies: ["Sentry", "SentryInternal"],
+        dependencies: ["Sentry"],
         path: "Sources/SentrySwiftUI",
-        exclude: ["SentryInternal/", "module.modulemap"],
+        exclude: ["module.modulemap"],
         linkerSettings: [
             .linkedFramework("Sentry")
         ]
     ),
-    .target(
-        name: "SentryInternal",
-        path: "Sources/SentrySwiftUI",
-        sources: [
-            "SentryInternal/"
-        ],
-        publicHeadersPath: "SentryInternal/"
-    ),
     .target(
         name: "SentryCppHelper",
         path: "Sources/SentryCppHelper",