test: sample app build tooling

.build-sample-apps.tmuxinator.yml

@@ -0,0 +1,25 @@
+   name: build-sample-apps
+
+   windows:
+     - build:
+         layout: tiled
+         panes:
+           - bash -c 'cd ./Samples/iOS13-Swift && xcodebuild build -scheme iOS13-Swift | xcbeautify; echo $? > /tmp/iOS13-Swift.exit'
+           - bash -c 'cd ./Samples/iOS-SwiftUI && xcodebuild build -scheme iOS-SwiftUI | xcbeautify; echo $? > /tmp/iOS-SwiftUI.exit'
+           - bash -c 'cd ./Samples/iOS-Swift6 && xcodebuild build -scheme iOS-Swift6 | xcbeautify; echo $? > /tmp/iOS-Swift6.exit'
+           - bash -c 'cd ./Samples/iOS-Swift && xcodebuild build -scheme iOS-Swift | xcbeautify; echo $? > /tmp/iOS-Swift.exit'
+           - bash -c 'cd ./Samples/watchOS-Swift && xcodebuild build -scheme "watchOS-Swift WatchKit App" | xcbeautify; echo $? > /tmp/watchOS-Swift.exit'
+           - bash -c 'cd ./Samples/visionOS-Swift && xcodebuild build -scheme visionOS-Swift | xcbeautify; echo $? > /tmp/visionOS-Swift.exit'
+           - bash -c 'cd ./Samples/tvOS-Swift && xcodebuild build -scheme tvOS-Swift | xcbeautify; echo $? > /tmp/tvOS-Swift.exit'
+           - bash -c 'cd ./Samples/macOS-SwiftUI && xcodebuild build -scheme macOS-SwiftUI | xcbeautify; echo $? > /tmp/macOS-SwiftUI.exit'
+           - bash -c 'cd ./Samples/macOS-Swift && xcodebuild build -scheme macOS-Swift | xcbeautify; echo $? > /tmp/macOS-Swift.exit'
+           - bash -c 'cd ./Samples/iOS15-SwiftUI && xcodebuild build -scheme iOS15-SwiftUI | xcbeautify; echo $? > /tmp/iOS15-SwiftUI.exit'
+           - bash -c 'cd ./Samples/iOS-ObjectiveC && xcodebuild build -scheme iOS-ObjectiveC | xcbeautify; echo $? > /tmp/iOS-ObjectiveC.exit'
+           - |
+             while [ ! -f /tmp/iOS13-Swift.exit ] || [ ! -f /tmp/iOS-SwiftUI.exit ] || [ ! -f /tmp/iOS-Swift6.exit ] || [ ! -f /tmp/iOS-Swift.exit ] || [ ! -f /tmp/watchOS-Swift.exit ] || [ ! -f /tmp/visionOS-Swift.exit ] || [ ! -f /tmp/tvOS-Swift.exit ] || [ ! -f /tmp/macOS-SwiftUI.exit ] || [ ! -f /tmp/macOS-Swift.exit ] || [ ! -f /tmp/iOS15-SwiftUI.exit ] || [ ! -f /tmp/iOS-ObjectiveC.exit ]; do
+               sleep 1
+             done
+             for file in /tmp/*.exit; do
+               echo "$file: $(cat $file)"
+             done
+             rm /tmp/*.exit

.gitignore

@@ -237,3 +237,4 @@ Samples/macOS-SwiftUI/macOS-SwiftUI.xcodeproj
 Samples/tvOS-Swift/tvOS-Swift.xcodeproj
 Samples/visionOS-Swift/visionOS-Swift.xcodeproj
 Samples/watchOS-Swift/watchOS-Swift.xcodeproj
+Samples/SentrySampleShared/SentrySampleShared.xcodeproj

Brewfile

@@ -4,4 +4,6 @@ brew 'pre-commit'
 brew 'python3'
 brew 'xcbeautify'
 brew 'rbenv'
+brew 'tmux'
+brew 'tmuxinator'
 brew 'xcodegen'

Makefile

@@ -145,6 +145,7 @@ release-pod:
 	pod trunk push SentrySwiftUI.podspec
 
 xcode:
+	xcodegen --spec Samples/SentrySampleShared/SentrySampleShared.yml
 	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
 	xcodegen --spec Samples/iOS-ObjectiveC/iOS-ObjectiveC.yml
 	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
@@ -158,3 +159,8 @@ xcode:
 	xcodegen --spec Samples/visionOS-Swift/visionOS-Swift.yml
 	xcodegen --spec Samples/watchOS-Swift/watchOS-Swift.yml
 	open Sentry.xcworkspace
+
+.PHONY: build-sample-apps
+
+build-sample-apps:
+	tmuxinator start -p .build-sample-apps.tmuxinator.yml

Samples/SentrySampleShared/SentrySampleShared.xcconfig

@@ -0,0 +1,32 @@
+#include "../Shared/Config/Architectures.xcconfig"
+#include "../Shared/Config/BuildOptions.xcconfig"
+#include "../Shared/Config/Deployment.xcconfig"
+#include "../Shared/Config/Linking.xcconfig"
+#include "../Shared/Config/Localization.xcconfig"
+#include "../Shared/Config/Packaging.xcconfig"
+#include "../Shared/Config/SearchPaths.xcconfig"
+#include "../Shared/Config/Signing.xcconfig"
+#include "../Shared/Config/Versioning.xcconfig"
+#include "../Shared/Config/CodeGeneration.xcconfig"
+#include "../Shared/Config/ClangLanguage.xcconfig"
+#include "../Shared/Config/ClangCppLanguage.xcconfig"
+#include "../Shared/Config/ClangModules.xcconfig"
+#include "../Shared/Config/ClangObjCLanguage.xcconfig"
+#include "../Shared/Config/ClangPreprocessing.xcconfig"
+#include "../Shared/Config/ClangWarnings.xcconfig"
+#include "../Shared/Config/ClangWarningsCpp.xcconfig"
+#include "../Shared/Config/ClangWarningsObjC.xcconfig"
+#include "../Shared/Config/AssetCatalog.xcconfig"
+#include "../Shared/Config/ClangAnalyzer.xcconfig"
+#include "../Shared/Config/Swift.xcconfig"
+#include "../Shared/Config/Metal.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySampleShared
+INFOPLIST_FILE = SentrySampleShared/Info.plist
+SUPPORTED_PLATFORMS = xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos
+
+CODE_SIGN_STYLE = Manual
+CODE_SIGN_IDENTITY =
+CODE_SIGN_IDENTITY[sdk=macosx*] =
+PROVISIONING_PROFILE_SPECIFIER =
+DEVELOPMENT_TEAM =

Samples/SentrySampleShared/SentrySampleShared.yml

@@ -0,0 +1,29 @@
+name: SentrySampleShared
+createIntermediateGroups: true
+generateEmptyDirectories: true
+configs:
+  Debug: debug
+  Test: debug
+  TestCI: debug
+  Release: release
+projectReferences:
+  Sentry:
+    path: ../../Sentry.xcodeproj
+fileGroups:
+  - ../Shared/Config
+  - SentrySampleShared.yml
+options:
+  bundleIdPrefix: io.sentry
+targets:
+  SentrySampleShared:
+    type: framework
+    platform: auto
+    sources:
+      - SentrySampleShared
+    dependencies:
+      - target: Sentry/Sentry
+    configFiles:
+      Debug: SentrySampleShared.xcconfig
+      Release: SentrySampleShared.xcconfig
+      Test: SentrySampleShared.xcconfig
+      TestCI: SentrySampleShared.xcconfig

Samples/SentrySampleShared/SentrySampleShared/AssertView.swift

@@ -0,0 +1,94 @@
+#if !os(macOS) && !os(watchOS)
+
+import Foundation
+import Sentry
+import UIKit
+
+public class AssertView: UIView {
+    var span: Span?
+    public var autoHide = true
+
+    private var assertLabel: UILabel!
+    private var errorLabel: UILabel!
+
+    var message: String? {
+        get {
+            return assertLabel.text
+        }
+        set {
+            assertLabel.text = newValue
+            setNeedsLayout()
+        }
+    }
+
+    var errorMessage: String? {
+        get {
+            return errorLabel.text
+        }
+        set {
+            errorLabel.text = newValue
+            setNeedsLayout()
+        }
+    }
+
+    convenience init() {
+        self.init(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
+    }
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initialize()
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        initialize()
+    }
+
+    private func initialize() {
+        backgroundColor = UIColor(white: 0.3, alpha: 1)
+
+        assertLabel = UILabel().forAutoLayout()
+        assertLabel.textColor = UIColor(white: 1, alpha: 1)
+        assertLabel.accessibilityIdentifier = "ASSERT_MESSAGE"
+        addSubview(assertLabel)
+
+        errorLabel = UILabel().forAutoLayout()
+        errorLabel.textColor = UIColor(white: 1, alpha: 1)
+        errorLabel.accessibilityIdentifier = "ASSERT_ERROR"
+        errorLabel.numberOfLines = 0
+        addSubview(errorLabel)
+
+        let guide = self.safeAreaLayoutGuide
+
+        let constraints = [
+            assertLabel.topAnchor.constraint(equalTo: guide.topAnchor, constant: 16),
+            assertLabel.leftAnchor.constraint(equalTo: guide.leftAnchor, constant: 16),
+            assertLabel.rightAnchor.constraint(equalTo: guide.rightAnchor, constant: -16),
+
+            errorLabel.topAnchor.constraint(equalTo: assertLabel.bottomAnchor, constant: 16),
+            errorLabel.leftAnchor.constraint(equalTo: guide.leftAnchor, constant: 16),
+            errorLabel.rightAnchor.constraint(equalTo: guide.rightAnchor, constant: -16),
+            errorLabel.bottomAnchor.constraint(equalTo: guide.bottomAnchor, constant: 0)
+        ]
+        NSLayoutConstraint.activate(constraints)
+    }
+
+    public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        //If a tap occurs outside the view, it disappears
+        let result = super.hitTest(point, with: event)
+        if result == nil {
+            close()
+        }
+        return result
+    }
+
+    private func close() {
+        UIAssert.shared.reset()
+        if autoHide {
+            removeFromSuperview()
+        }
+    }
+}
+
+#endif // !os(macOS) && !os(watchOS)

Samples/Shared/DSNStorage.swift → Samples/SentrySampleShared/SentrySampleShared/DSNStorage.swift

@@ -4,35 +4,33 @@ import Sentry
 /**
  * Stores the DSN to a file in the cache directory.
  */
-class DSNStorage {
-
-    static let shared = DSNStorage()
-
+public class DSNStorage {
+    public static let shared = DSNStorage()
     private let dsnFile: URL
-    
+
     private init() {
         // swiftlint:disable force_unwrapping
         let cachesDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
         // swiftlint:enable force_unwrapping
         dsnFile = cachesDirectory.appendingPathComponent("dsn")
     }
-    
-    func saveDSN(dsn: String) throws {
+
+    public func saveDSN(dsn: String) throws {
         try deleteDSN()
         try dsn.write(to: dsnFile, atomically: true, encoding: .utf8)
     }
-    
-    func getDSN() throws -> String? {
+
+    public func getDSN() throws -> String? {
         let fileManager = FileManager.default
-        
+
         guard fileManager.fileExists(atPath: dsnFile.path) else {
             return nil
         }
-        
+
         return try String(contentsOfFile: dsnFile.path)
     }
-    
-    func deleteDSN() throws {
+
+    public func deleteDSN() throws {
         let fileManager = FileManager.default
         if fileManager.fileExists(atPath: dsnFile.path) {
             try fileManager.removeItem(at: dsnFile)

Samples/iOS-Swift/iOS-Swift/EnvironmentVariableTableViewCell.swift → Samples/SentrySampleShared/SentrySampleShared/EnvironmentVariableTableViewCell.swift

@@ -1,3 +1,4 @@
+#if !os(macOS) && !os(tvOS) && !os(watchOS)
 import UIKit
 
 class EnvironmentVariableTableViewCell: UITableViewCell, UITextFieldDelegate {
@@ -49,5 +50,7 @@ class EnvironmentVariableTableViewCell: UITableViewCell, UITextFieldDelegate {
         } else {
             override?.stringValue = textField.text
         }
+        SentrySDKWrapper.shared.startSentry()
     }
 }
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS)

Samples/iOS-Swift/iOS-Swift/FeaturesViewController.swift → Samples/SentrySampleShared/SentrySampleShared/FeaturesViewController.swift

@@ -1,7 +1,8 @@
+#if !os(macOS) && !os(tvOS) && !os(watchOS)
 import UIKit
 
-class FeaturesViewController: UITableViewController {
-    override func viewDidLoad() {
+public class FeaturesViewController: UITableViewController {
+    public override func viewDidLoad() {
         super.viewDidLoad()
         tableView.register(LaunchArgumentTableViewCell.self, forCellReuseIdentifier: "launchArgumentCell")
         tableView.register(EnvironmentVariableTableViewCell.self, forCellReuseIdentifier: "environmentVariableCell")
@@ -34,11 +35,11 @@ class FeaturesViewController: UITableViewController {
         tableView.reloadData()
     }
 
-    override func numberOfSections(in tableView: UITableView) -> Int {
+    public override func numberOfSections(in tableView: UITableView) -> Int {
         6
     }
 
-    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    public override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         if section == 0 {
             return "Special"
         } else if section == 1 {
@@ -55,7 +56,7 @@ class FeaturesViewController: UITableViewController {
         return nil
     }
 
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if section == 0 {
             return SentrySDKOverrides.Special.allCases.count
         } else if section == 1 {
@@ -72,7 +73,7 @@ class FeaturesViewController: UITableViewController {
         return 0
     }
 
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 2 {
             if SentrySDKOverrides.Tracing.boolValues.contains(SentrySDKOverrides.Tracing.allCases[indexPath.row]) {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "launchArgumentCell", for: indexPath) as! LaunchArgumentTableViewCell
@@ -116,3 +117,4 @@ class FeaturesViewController: UITableViewController {
         return cell
     }
 }
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS)

Samples/SentrySampleShared/SentrySampleShared/GitInjections.swift

@@ -0,0 +1,29 @@
+import Foundation
+import Sentry
+
+extension Bundle {
+    var gitCommitHash: String? {
+        infoDictionary?["GIT_COMMIT_HASH"] as? String
+    }
+    var gitBranchName: String? {
+        infoDictionary?["GIT_BRANCH"] as? String
+    }
+    var gitStatusClean: Bool {
+        (infoDictionary?["GIT_STATUS_CLEAN"] as? String) == "1"
+    }
+}
+
+public func injectGitInformation(scope: Scope) {
+    if let commitHash = Bundle.main.gitCommitHash {
+        scope.setTag(value: "\(commitHash)\(Bundle.main.gitStatusClean ? "" : "-dirty")", key: "git-commit-hash")
+    }
+    if let branchName = Bundle.main.gitBranchName {
+        scope.setTag(value: branchName, key: "git-branch-name")
+    }
+}
+
+public class GitInjector: NSObject {
+    @objc public static func objc_injectGitInformation(into scope: Scope) {
+        injectGitInformation(scope: scope)
+    }
+}

Samples/SentrySampleShared/SentrySampleShared/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>

Samples/iOS-Swift/iOS-Swift/LaunchArgumentTableViewCell.swift → Samples/SentrySampleShared/SentrySampleShared/LaunchArgumentTableViewCell.swift

@@ -1,3 +1,5 @@
+#if !os(macOS) && !os(tvOS) && !os(watchOS)
+import Sentry
 import UIKit
 
 class LaunchArgumentTableViewCell: UITableViewCell {
@@ -11,6 +13,7 @@ class LaunchArgumentTableViewCell: UITableViewCell {
 
     @objc func toggleFlag() {
         override?.boolValue = flagSwitch.isOn
+        SentrySDKWrapper.shared.startSentry()
     }
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -31,3 +34,4 @@ class LaunchArgumentTableViewCell: UITableViewCell {
         self.override = override
     }
 }
+#endif // !os(macOS) && !os(tvOS) && !os(watchOS)