diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index 24dad0decbe..ef819b2e438 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -6947,7 +6947,7 @@ MODULEMAP_FILE = ""; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -7354,7 +7354,7 @@ MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -7651,7 +7651,7 @@ MODULEMAP_FILE = ""; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -7698,7 +7698,7 @@ MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -7744,7 +7744,7 @@ MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -7790,7 +7790,7 @@ MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-DCARTHAGE"; + OTHER_SWIFT_FLAGS = "-DXCODE"; PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftUI; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; diff --git a/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreview.swift b/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreview.swift index ebfc2f3c00e..ce13472b97c 100644 --- a/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreview.swift +++ b/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreview.swift @@ -3,7 +3,7 @@ import Sentry import SwiftUI import UIKit -#if CARTHAGE || SWIFT_PACKAGE +#if XCODE || SWIFT_PACKAGE @_implementationOnly import SentryInternal #endif diff --git a/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreviewUIView.swift b/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreviewUIView.swift index e927c5e1370..7cb5a4bbd2a 100644 --- a/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreviewUIView.swift +++ b/Sources/SentrySwiftUI/Preview/SentryReplayMaskPreviewUIView.swift @@ -2,7 +2,7 @@ import Sentry import UIKit -#if CARTHAGE || SWIFT_PACKAGE +#if XCODE || SWIFT_PACKAGE import Sentry._Hybrid @_implementationOnly import SentryInternal #endif diff --git a/Sources/SentrySwiftUI/SentryReplayView.swift b/Sources/SentrySwiftUI/SentryReplayView.swift index 569a4ca6232..234109b0545 100644 --- a/Sources/SentrySwiftUI/SentryReplayView.swift +++ b/Sources/SentrySwiftUI/SentryReplayView.swift @@ -3,7 +3,7 @@ import Sentry import SwiftUI import UIKit -#if CARTHAGE || SWIFT_PACKAGE +#if XCODE || SWIFT_PACKAGE @_implementationOnly import SentryInternal #endif diff --git a/Sources/SentrySwiftUI/SentryTracedView.swift b/Sources/SentrySwiftUI/SentryTracedView.swift index 82da3b9ebd8..45b57ba3d6f 100644 --- a/Sources/SentrySwiftUI/SentryTracedView.swift +++ b/Sources/SentrySwiftUI/SentryTracedView.swift @@ -4,7 +4,7 @@ import Foundation import Sentry import SwiftUI -#if CARTHAGE || SWIFT_PACKAGE +#if XCODE || SWIFT_PACKAGE @_implementationOnly import SentryInternal #endif diff --git a/Sources/Swift/Helper/SentrySdkPackage.swift b/Sources/Swift/Helper/SentrySdkPackage.swift index f5f3780b36b..b5ef551ee3e 100644 --- a/Sources/Swift/Helper/SentrySdkPackage.swift +++ b/Sources/Swift/Helper/SentrySdkPackage.swift @@ -5,18 +5,13 @@ import Foundation private enum SentryPackageManagerOption: UInt { case swiftPackageManager = 0 case cocoaPods = 1 - case carthage = 2 - case unknown = 3 + case unknown = 2 } #if SWIFT_PACKAGE private var SENTRY_PACKAGE_INFO: SentryPackageManagerOption = .swiftPackageManager #elseif COCOAPODS private var SENTRY_PACKAGE_INFO: SentryPackageManagerOption = .cocoaPods -#elseif CARTHAGE_YES -// CARTHAGE is a xcodebuild build setting with value `YES`, we need to convert it into a compiler -// definition to be able to use it. -private var SENTRY_PACKAGE_INFO: SentryPackageManagerOption = .carthage #else private var SENTRY_PACKAGE_INFO: SentryPackageManagerOption = .unknown #endif @@ -30,9 +25,8 @@ private var SENTRY_PACKAGE_INFO: SentryPackageManagerOption = .unknown return "spm:getsentry/\(SentryMeta.sdkName)" case .cocoaPods: return "cocoapods:getsentry/\(SentryMeta.sdkName)" - case .carthage: - return "carthage:getsentry/\(SentryMeta.sdkName)" case .unknown: + // We don't know if the user installed Sentry with Xcode, manually or Carthage using the prebuild xcframework return nil } } diff --git a/Tests/SentryTests/Protocol/SentrySdkInfoTests.swift b/Tests/SentryTests/Protocol/SentrySdkInfoTests.swift index 82acb0afb0e..5db641619eb 100644 --- a/Tests/SentryTests/Protocol/SentrySdkInfoTests.swift +++ b/Tests/SentryTests/Protocol/SentrySdkInfoTests.swift @@ -108,18 +108,7 @@ class SentrySdkInfoTests: XCTestCase { XCTAssertEqual(packages[0]["version"] as? String, SentryMeta.versionString) } - func testCarthage_packageInfo() throws { - SentrySdkPackage.setPackageManager(2) - let actual = SentrySdkInfo.global() - let serialization = actual.serialize() - - let packages = try XCTUnwrap(serialization["packages"] as? [[String: Any]]) - XCTAssertEqual(1, packages.count) - XCTAssertEqual(packages[0]["name"] as? String, "carthage:getsentry/\(SentryMeta.sdkName)") - XCTAssertEqual(packages[0]["version"] as? String, SentryMeta.versionString) - } - - func testcocoapods_packageInfo() throws { + func testCocoapods_packageInfo() throws { SentrySdkPackage.setPackageManager(1) let actual = SentrySdkInfo.global() let serialization = actual.serialize() @@ -131,7 +120,8 @@ class SentrySdkInfoTests: XCTestCase { } func testNoPackageNames() { - SentrySdkPackage.setPackageManager(3) + // Unkown package + SentrySdkPackage.setPackageManager(2) let actual = SentrySdkInfo.global() XCTAssertEqual(0, actual.packages.count) diff --git a/scripts/build-xcframework-slice.sh b/scripts/build-xcframework-slice.sh index 628a32e16e3..7344318bcd1 100755 --- a/scripts/build-xcframework-slice.sh +++ b/scripts/build-xcframework-slice.sh @@ -45,7 +45,6 @@ if [ "$sdk" = "maccatalyst" ]; then -derivedDataPath ./Carthage/DerivedData \ CODE_SIGNING_REQUIRED=NO \ CODE_SIGN_IDENTITY= \ - CARTHAGE=YES \ MACH_O_TYPE="$MACH_O_TYPE" \ SUPPORTS_MACCATALYST=YES \ ENABLE_CODE_COVERAGE=NO \ @@ -73,7 +72,6 @@ else CODE_SIGNING_REQUIRED=NO \ SKIP_INSTALL=NO \ CODE_SIGN_IDENTITY= \ - CARTHAGE=YES \ MACH_O_TYPE="$MACH_O_TYPE" \ ENABLE_CODE_COVERAGE=NO \ GCC_GENERATE_DEBUGGING_SYMBOLS="$GCC_GENERATE_DEBUGGING_SYMBOLS" \