PR feedback

Author: noahsmartin

.github/workflows/build.yml

@@ -363,7 +363,6 @@ jobs:
         ios-swift-release,
         build-sample,
         build-distribution,
-        build-distribution-sample,
         build-spm,
         build-v9,
         check-debug-without-UIKit,

.github/workflows/test.yml

@@ -99,15 +99,15 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
-      - run: set -o pipefail && NSUnbufferedIO=YES xcodebuild test -scheme SentryDistributionTests -sdk iphoneos -destination 'generic/platform=iphoneos' | tee raw-test-output-spm.log | xcbeautify
+      - run: set -o pipefail && NSUnbufferedIO=YES SKIP_BINARIES=1 xcodebuild test -scheme Sentry-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16 Pro' | tee raw-test-output-spm.log | xcbeautify --preserve-unbeautified
         shell: sh
-      - name: Upload SPM Test Logs
+      - name: Upload Distribution Test Logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() || cancelled() }}
         with:
-          name: raw-test-output-spm
+          name: raw-test-output-distribution
           path: |
-            raw-test-output-spm.log
+            raw-test-output-distribution.log
 
   unit-tests:
     name: Unit ${{matrix.name}}

Package.swift

@@ -11,10 +11,6 @@ import PackageDescription
 
 var products: [Product] = [
     .library(name: "Sentry", targets: ["Sentry", "SentryCppHelper"]),
-    .library(name: "Sentry-Dynamic", targets: ["Sentry-Dynamic"]),
-    .library(name: "Sentry-Dynamic-WithARM64e", targets: ["Sentry-Dynamic-WithARM64e"]),
-    .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"])
 ]
@@ -25,26 +21,6 @@ var targets: [Target] = [
         url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry.xcframework.zip",
         checksum: "ecc100b59f2044800650f17786c33f071ea580cb318d82e8ce1d403b643555a4" //Sentry-Static
     ),
-    .binaryTarget(
-        name: "Sentry-Dynamic",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic.xcframework.zip",
-        checksum: "509cdbc89e4409614f6d584464ef7e1d26c47ad8afe3abc2bd1e1d71c068be1e" //Sentry-Dynamic
-    ),
-    .binaryTarget(
-        name: "Sentry-Dynamic-WithARM64e",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
-        checksum: "d62a5ced65465c7c63962ed40d06a9aadd8675b8d0909089f89f65bf233e38c3" //Sentry-Dynamic-WithARM64e
-    ),
-    .binaryTarget(
-        name: "Sentry-WithoutUIKitOrAppKit",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
-        checksum: "4abfe912bb543eedb7d7dd015df04c93c2b8e49437962046137653d4cf737d38" //Sentry-WithoutUIKitOrAppKit
-    ),
-    .binaryTarget(
-        name: "Sentry-WithoutUIKitOrAppKit-WithARM64e",
-        url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
-        checksum: "0b6b454b48614f8cd2430cdc75e524ded46308309b95e73fdd9a90da81622e77" //Sentry-WithoutUIKitOrAppKit-WithARM64e
-    ),
     .target (
         name: "SentrySwiftUI",
         dependencies: ["Sentry", "SentryInternal"],
@@ -69,9 +45,42 @@ var targets: [Target] = [
         ]
     ),
     .target(name: "SentryDistribution", path: "Sources/SentryDistribution"),
-    .testTarget(name: "SentryDistributionTests", path: "Sources/SentryDistributionTests")
+    .testTarget(name: "SentryDistributionTests", dependencies: ["SentryDistribution"], path: "Sources/SentryDistributionTests")
 ]
 
+let skipBinaries = getenv("SKIP_BINARIES").map { String(cString: $0, encoding: .utf8) }
+if skipBinaries != "1" {
+  products.append(contentsOf: [
+    .library(name: "Sentry-Dynamic", targets: ["Sentry-Dynamic"]),
+    .library(name: "Sentry-Dynamic-WithARM64e", targets: ["Sentry-Dynamic-WithARM64e"]),
+    .library(name: "Sentry-WithoutUIKitOrAppKit", targets: ["Sentry-WithoutUIKitOrAppKit", "SentryCppHelper"]),
+    .library(name: "Sentry-WithoutUIKitOrAppKit-WithARM64e", targets: ["Sentry-WithoutUIKitOrAppKit-WithARM64e", "SentryCppHelper"])
+  ])
+  
+  targets.append(contentsOf: [
+    .binaryTarget(
+      name: "Sentry-Dynamic",
+      url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic.xcframework.zip",
+      checksum: "509cdbc89e4409614f6d584464ef7e1d26c47ad8afe3abc2bd1e1d71c068be1e" //Sentry-Dynamic
+    ),
+    .binaryTarget(
+      name: "Sentry-Dynamic-WithARM64e",
+      url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-Dynamic-WithARM64e.xcframework.zip",
+      checksum: "d62a5ced65465c7c63962ed40d06a9aadd8675b8d0909089f89f65bf233e38c3" //Sentry-Dynamic-WithARM64e
+    ),
+    .binaryTarget(
+      name: "Sentry-WithoutUIKitOrAppKit",
+      url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit.xcframework.zip",
+      checksum: "4abfe912bb543eedb7d7dd015df04c93c2b8e49437962046137653d4cf737d38" //Sentry-WithoutUIKitOrAppKit
+    ),
+    .binaryTarget(
+      name: "Sentry-WithoutUIKitOrAppKit-WithARM64e",
+      url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.0/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
+      checksum: "0b6b454b48614f8cd2430cdc75e524ded46308309b95e73fdd9a90da81622e77" //Sentry-WithoutUIKitOrAppKit-WithARM64e
+    )
+  ])
+}
+
 let env = getenv("EXPERIMENTAL_SPM_BUILDS")
 if let env = env, String(cString: env, encoding: .utf8) == "1" {
     products.append(.library(name: "SentrySPM", type: .dynamic, targets: ["SentryObjc"]))

Samples/DistributionSample/DistributionSample.xcconfig

@@ -1,4 +1,4 @@
-PRODUCT_BUNDLE_IDENTIFIER = io.sentry.DistributionSample
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.DistributionSample
 INFOPLIST_FILE = DistributionSample/Info.plist
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator
 IPHONEOS_DEPLOYMENT_TARGET = 15.0

Samples/DistributionSample/DistributionSample.yml

@@ -5,7 +5,7 @@ configs:
   Debug: debug
   Release: release
 options:
-  bundleIdPrefix: io.sentry
+  bundleIdPrefix: io.sentry.sample.
 packages:
   Sentry:
     path: ../../

Samples/DistributionSample/DistributionSample/UpdateUtil.swift

@@ -11,7 +11,6 @@ enum UpdateUtil {
     }
   }
 
-  @MainActor
   static func handleUpdateResult(result: Result<UpdateCheckResponse, Error>) {
     guard case let .success(releaseInfo) = result else {
       if case let .failure(error) = result {
@@ -27,23 +26,13 @@ enum UpdateUtil {
 
     UpdateUtil.installRelease(releaseInfo: releaseInfo)
   }
-  
-  @MainActor
+
   private static func installRelease(releaseInfo: ReleaseInfo) {
     guard let url = Updater.buildUrlForInstall(releaseInfo.downloadUrl) else {
       return
     }
     DispatchQueue.main.async {
-      UIApplication.shared.open(url) { _ in
-        // Post notification event before closing the app
-        NotificationCenter.default.post(name: UIApplication.willTerminateNotification, object: nil)
-
-        // Close the app after a slight delay so it has time to execute code for the notification
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-          // We need to exit since iOS doesn't start the install until the app exits
-          exit(0)
-        }
-      }
+      Updater.install(url: url)
     }
   }
 }

Sources/SentryDistribution/Updater.swift

@@ -1,5 +1,7 @@
 import Foundation
+#if canImport(UIKit)
 import UIKit
+#endif
 
 /// A class for checking and installing app updates from Sentry's distribution service.
 public final class Updater {
@@ -36,9 +38,26 @@ public final class Updater {
     }
   }
 
+  #if canImport(UIKit)
+  /// Install an update from the provided URL
+  /// - Parameter url: The itms-services URL
+  @MainActor public static func install(url: URL) {
+    UIApplication.shared.open(url) { _ in
+      // Post notification event before closing the app
+      NotificationCenter.default.post(name: UIApplication.willTerminateNotification, object: nil)
+
+      // Close the app after a slight delay so it has time to execute code for the notification
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+        // We need to exit since iOS doesn't start the install until the app exits
+        exit(0)
+      }
+    }
+  }
+  #endif
+
   /// Obtain a URL to install an IPA
   /// - Parameter plistUrl: The URL to the plist containing the IPA information
-  /// - Returns: a URL ready to install the IPA using Itunes Services
+  /// - Returns: a URL ready to install the IPA using itms-services
   public static func buildUrlForInstall(_ plistUrl: String) -> URL? {
     guard var components = URLComponents(string: "itms-services://") else {
       return nil