Mac catalyst support

Backtrace.xcodeproj/project.pbxproj

@@ -411,6 +411,7 @@
 		1B23C39D7D0C11ABC494BDF4 /* Pods_Example_macOS_ObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_macOS_ObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1F36490C977B28FFED3FA6BB /* Pods-Example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-Example-tvOS/Pods-Example-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
 		2046B4552C46F97800A927DB /* BacktraceResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BacktraceResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		2050DB9C2C61A09D00C6CCA9 /* Example-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Example-iOS.entitlements"; sourceTree = "<group>"; };
 		2062D9C42C457B4500E4CE3C /* Crash+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Crash+CoreDataClass.swift"; sourceTree = "<group>"; };
 		2062D9C52C457B4500E4CE3C /* Crash+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Crash+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		26A69065BABD7253C1D61320 /* Pods_Backtrace_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Backtrace_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1027,6 +1028,7 @@
 		F2C2FA4421BBD23B00934744 = {
 			isa = PBXGroup;
 			children = (
+				2050DB9C2C61A09D00C6CCA9 /* Example-iOS.entitlements */,
 				F254690423E6FB750063E4B9 /* Examples */,
 				F266B85321C77D5D00D14417 /* Tests */,
 				F2C2FA8421BBD2AE00934744 /* Sources */,
@@ -2505,7 +2507,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = bundle;
@@ -2591,7 +2594,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = bundle;
@@ -3493,7 +3497,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				STRIP_SWIFT_SYMBOLS = NO;
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3579,7 +3584,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				STRIP_SWIFT_SYMBOLS = NO;
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3784,6 +3790,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = "Example-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
@@ -3823,6 +3830,8 @@
 				SDKROOT = iphoneos;
 				STRIP_STYLE = debugging;
 				STRIP_SWIFT_SYMBOLS = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "Examples/Common/Examples-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3866,6 +3875,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = "Example-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
@@ -3898,6 +3908,8 @@
 				SDKROOT = iphoneos;
 				STRIP_STYLE = debugging;
 				STRIP_SWIFT_SYMBOLS = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "Examples/Common/Examples-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";

Example-iOS.entitlements

@@ -0,0 +1,10 @@
+<?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>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>

Sources/Features/Attributes/DefaultAttributes.swift

@@ -83,7 +83,7 @@ struct ProcessorInfo: AttributesSource {
 struct Device: AttributesSource {
 
     var mutable: [String: Any?] {
-        #if os(iOS)
+        #if os(iOS) && !targetEnvironment(macCatalyst)
         let device = UIDevice.current
         var attributes: [String: Any?] = ["device.orientation": device.orientation.name]
         if device.isBatteryMonitoringEnabled {
@@ -110,11 +110,11 @@ struct Device: AttributesSource {
     }
 
     private func getSysname() -> String {
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
         return "iOS"
 #elseif os(tvOS)
         return "tvOS"
-#elseif os(macOS)
+#elseif os(macOS) || targetEnvironment(macCatalyst)
         return "macOS"
 #else
         return "Unsupported device"
@@ -126,15 +126,15 @@ struct ScreenInfo: AttributesSource {
 
     private enum Key: String {
         case count = "screens.count"
-        #if os(iOS) || os(tvOS)
+        #if (os(iOS) || os(tvOS)) && !targetEnvironment(macCatalyst)
         case scale = "screen.scale"
         case width = "screen.width"
         case height = "screen.height"
         case nativeScale = "screen.scale.native"
         case nativeWidth = "screen.width.native"
         case nativeHeight = "screen.height.native"
         case brightness = "screen.brightness"
-        #elseif os(macOS)
+        #elseif os(macOS) || targetEnvironment(macCatalyst)
         case mainScreenWidth = "screen.main.width"
         case mainScreenHeight = "screen.main.height"
         case mainScreenScale = "screen.main.scale"
@@ -143,7 +143,7 @@ struct ScreenInfo: AttributesSource {
 
     var immutable: [String: Any?] {
         var screenAttributes: Attributes = [:]
-        #if os(iOS) || os(tvOS)
+        #if (os(iOS) || os(tvOS)) && !targetEnvironment(macCatalyst)
         let mainScreen = UIScreen.main
         screenAttributes[Key.scale.rawValue] = mainScreen.scale
         screenAttributes[Key.width.rawValue] = mainScreen.bounds.width
@@ -152,7 +152,7 @@ struct ScreenInfo: AttributesSource {
         screenAttributes[Key.nativeWidth.rawValue] = mainScreen.nativeBounds.width
         screenAttributes[Key.nativeHeight.rawValue] = mainScreen.nativeBounds.height
         screenAttributes[Key.count.rawValue] = UIScreen.screens.count
-        #elseif os(macOS)
+        #elseif os(macOS) || !targetEnvironment(macCatalyst)
         screenAttributes[Key.count.rawValue] = NSScreen.screens.count
         if let mainScreen = NSScreen.main {
             screenAttributes[Key.mainScreenWidth.rawValue] = mainScreen.frame.width
@@ -161,7 +161,7 @@ struct ScreenInfo: AttributesSource {
         }
         #endif
 
-        #if os(iOS)
+        #if os(iOS) && !targetEnvironment(macCatalyst)
         screenAttributes[Key.brightness.rawValue] = UIScreen.main.brightness
         #endif
         return screenAttributes
@@ -252,7 +252,7 @@ struct BreadcrumbsInfo: AttributesSource {
 
 // swiftlint:enable type_name
 
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 private extension UIDeviceOrientation {
 
     var name: String {
@@ -271,7 +271,7 @@ private extension UIDeviceOrientation {
 }
 #endif
 
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 private extension UIDevice.BatteryState {
 
     var name: String {
@@ -287,7 +287,7 @@ private extension UIDevice.BatteryState {
 }
 #endif
 
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 private extension UIApplication.State {
 
     var name: String {

Sources/Features/Attributes/NetworkReachability.swift

@@ -42,7 +42,7 @@ extension NetworkReachability {
         guard let flags = flags else { return "unknown" }
         guard isNetworkReachable(with: flags) else { return "notReachable" }
 
-        #if os(iOS) || os(tvOS)
+        #if (os(iOS) || os(tvOS)) && !targetEnvironment(macCatalyst)
         if flags.contains(.isWWAN) { return "reachableViaWWAN" }
         #endif
 

Sources/Features/Breadcrumb/BacktraceNotificationObserver.swift

@@ -24,7 +24,7 @@ protocol BacktraceNotificationObserverDelegate: AnyObject {
         var handlerDelegates: [BacktraceNotificationHandlerDelegate] = [
             BacktraceMemoryNotificationObserver(),
             BacktraceBatteryNotificationObserver()]
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
         handlerDelegates.append(BacktraceOrientationNotificationObserver())
         handlerDelegates.append(BacktraceAppStateNotificationObserver())
         handlerDelegates.append(BacktraceCallNotificationObserver())
@@ -343,7 +343,7 @@ class BacktraceBatteryNotificationObserver: NSObject, BacktraceNotificationHandl
 #endif
 }
 
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
 // MARK: - Application State Observer
 enum ApplicationState: Int {
     case willEnterForeground

Sources/Features/Client/BacktraceReporter.swift

@@ -2,7 +2,7 @@ import Foundation
 
 final class BacktraceReporter {
 
-#if os(macOS)
+#if os(macOS) || !targetEnvironment(macCatalyst)
     lazy var memoryPressureSource: DispatchSourceMemoryPressure = {
         DispatchSource.makeMemoryPressureSource(eventMask: [.critical, .warning], queue: .global())
     }()
@@ -126,7 +126,7 @@ extension BacktraceReporter {
     }
 }
 
-#if os(iOS) || os(tvOS)
+#if (os(iOS) || os(tvOS))
 import UIKit
 typealias Application = UIApplication
 #elseif os(macOS)
@@ -157,7 +157,7 @@ extension BacktraceReporter {
                                                name: Application.willResignActiveNotification,
                                                object: nil)
 
-        #if os(iOS) || os(tvOS)
+        #if (os(iOS) || os(tvOS))
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(applicationWillEnterForeground),
                                                name: Application.willEnterForegroundNotification,

Sources/Features/Repository/Model/Attachment.swift

@@ -1,5 +1,5 @@
 import Foundation
-#if os(iOS) || os(tvOS)
+#if (os(iOS) || os(tvOS))
 import MobileCoreServices
 #elseif os(macOS)
 import CoreServices

Sources/Public/BacktraceClient.swift

@@ -12,7 +12,7 @@ import Foundation
     /// Error-free metrics class instance
     @objc private let metricsInstance: BacktraceMetrics
 
-#if os(iOS) || os(OSX)
+#if os(iOS) || os(OSX) || targetEnvironment(macCatalyst)
     /// Breadcrumbs class instance
     @objc private let breadcrumbsInstance: BacktraceBreadcrumbs = BacktraceBreadcrumbs()
 #endif
@@ -220,7 +220,7 @@ extension BacktraceClient: BacktraceMetricsProtocol {
 }
 
 // MARK: - BacktraceBreadcrumbProtocol
-#if os(iOS) || os(OSX)
+#if os(iOS) || os(OSX) || targetEnvironment(macCatalyst)
 extension BacktraceClient: BacktraceBreadcrumbProtocol {
     @objc public var breadcrumbs: BacktraceBreadcrumbs {
         return self.breadcrumbsInstance

Sources/Public/BacktraceClientConfiguration.swift

@@ -14,7 +14,7 @@ import Foundation
     /// Error-free metrics settings
     @objc public var metricsSettings: BacktraceMetricsSettings = BacktraceMetricsSettings()
 
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
     /// Breadcrumbs settings.
     @objc public var breadcrumbSettings: BacktraceBreadcrumbSettings = BacktraceBreadcrumbSettings()
 #endif

Sources/Public/BacktraceClientCustomizing.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 /// Type-alias of `BacktraceClient` type. Custom Backtrace client have to implement all of these protocols.
-#if os(iOS) || os(OSX)
+#if os(iOS) || os(OSX) || targetEnvironment(macCatalyst)
 public typealias BacktraceClientProtocol = BacktraceReporting & BacktraceClientCustomizing &
     BacktraceLogging & BacktraceMetricsProtocol & BacktraceBreadcrumbProtocol
 #else
@@ -106,7 +106,7 @@ enum BacktraceUrlParsingError: Error {
     case invalidInput(String)
 }
 
-#if os(iOS) || os(OSX)
+#if os(iOS) || os(OSX) || targetEnvironment(macCatalyst)
 /// Provides Breadcrumb adding functionality to `BacktraceClient`.
 @objc public protocol BacktraceBreadcrumbProtocol {
     @objc var breadcrumbs: BacktraceBreadcrumbs { get }

Tests/AttributesTests.swift

@@ -79,11 +79,11 @@ final class AttributesTests: QuickSpec {
                     fail("could not parse uname.sysname")
                     return
                 }
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
                 expect { sysname }.to(equal("iOS"))
 #elseif os(tvOS)
                 expect { sysname }.to(equal("tvOS"))
-#elseif os(macOS)
+#elseif os(macOS) || targetEnvironment(macCatalyst)
                 expect { sysname }.to(equal("macOS"))
 #else
                 fail("unsupported platform")

Tests/BacktraceBreadcrumbTests.swift

@@ -245,7 +245,7 @@ final class BacktraceBreadcrumbTests: QuickSpec {
                     expect { backtraceObserverMock2.startObservingCalled }.to(beTrue())
                 }
             }
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
             describe("when iOS notifications update") {
                 context("for memory warning notification") {
                     it("iOS breadcrumb added") {

Tests/BacktraceReporterTests.swift

@@ -216,7 +216,7 @@ final class BacktraceReporterTests: QuickSpec {
                     expect { result.report?.attributes["application.session"] }.toNot(beNil())
                     expect { result.report?.attributes["application.version"] }.toNot(beNil())
                 }
-#if os(iOS)
+#if os(iOS) && !targetEnvironment(macCatalyst)
                 it("report should have breadcrumbs attributes if breadcrumbs is enabled") {
                     let breadcrumbs = BacktraceBreadcrumbs()
                     breadcrumbs.enableBreadcrumbs()

Tests/Mocks/BacktraceNotificationObserverMock.swift

@@ -2,7 +2,7 @@ import Foundation
 import XCTest
 @testable import Backtrace
 
-#if os(iOS) || os(OSX)
+#if os(iOS) || os(OSX) || targetEnvironment(macCatalyst)
 class BacktraceObserverMock: BacktraceNotificationHandlerDelegate {
 
     var delegate: BacktraceNotificationObserverDelegate?

fastlane/Fastfile

@@ -20,7 +20,12 @@ platform :ios do
   lane :tests do
     sync_podspec_version_to_xcode()
     common_tests(scheme: "Backtrace-iOS-lib", disable_slide_to_type: true)
-    ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
+  end
+
+  desc "Run Mac Catalyst tests"
+  lane :catalyst_tests do
+    sync_podspec_version_to_xcode()
+    common_tests(scheme: "Backtrace-macOS-lib", disable_slide_to_type: true)
   end
 end
 

fastlane/README.md

@@ -42,6 +42,14 @@ Sync Podspec version to Xcode MARKETING_VERSION
 
 Run iOS tests
 
+### ios catalyst_tests
+
+```sh
+[bundle exec] fastlane ios catalyst_tests
+```
+
+Run Mac Catalyst tests
+
 ----
 
 

scripts/deploy.sh

@@ -6,4 +6,4 @@ set -o xtrace # to trace what gets executed. Useful for debugging
 
 # This script requires the `COCOAPODS_TRUNK_TOKEN` env var to be set. 
 # See more: https://fuller.li/posts/automated-cocoapods-releases-with-ci/.
-pod trunk push Backtrace.podspec --allow-warnings
+#pod trunk push Backtrace.podspec --allow-warnings

scripts/test.sh

@@ -5,6 +5,7 @@ set -o nounset # to exit when your script tries to use undeclared variables
 set -o xtrace # to trace what gets executed. Useful for debugging
 
 fastlane ios tests
+fastlane ios catalyst_tests
 fastlane mac tests
 fastlane tvos tests
 pod lib lint --verbose --allow-warnings --sources='https://cdn.cocoapods.org/'