Skip to content

chore: Rename CARTHAGE macro to XCODE #6929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2025
+15 −33
Merged

chore: Rename CARTHAGE macro to XCODE #6929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8ce73
chore: Rename `CARTHAGE` macro to `XCODE`
itaybre Nov 28, 2025
2147614
Update test
itaybre Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Sentry.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Sources/SentrySwiftUI/Preview/SentryReplayMaskPreview.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Sentry
import SwiftUI
import UIKit

#if CARTHAGE || SWIFT_PACKAGE
#if XCODE || SWIFT_PACKAGE
@_implementationOnly import SentryInternal
#endif

Expand Down
2 changes: 1 addition & 1 deletion Sources/SentrySwiftUI/Preview/SentryReplayMaskPreviewUIView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import Sentry
import UIKit

#if CARTHAGE || SWIFT_PACKAGE
#if XCODE || SWIFT_PACKAGE
import Sentry._Hybrid
@_implementationOnly import SentryInternal
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/SentrySwiftUI/SentryReplayView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Sentry
import SwiftUI
import UIKit

#if CARTHAGE || SWIFT_PACKAGE
#if XCODE || SWIFT_PACKAGE
@_implementationOnly import SentryInternal
#endif

Expand Down
2 changes: 1 addition & 1 deletion Sources/SentrySwiftUI/SentryTracedView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Foundation
import Sentry
import SwiftUI

#if CARTHAGE || SWIFT_PACKAGE
#if XCODE || SWIFT_PACKAGE
@_implementationOnly import SentryInternal
#endif

Expand Down
10 changes: 2 additions & 8 deletions Sources/Swift/Helper/SentrySdkPackage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
}
Expand Down
16 changes: 3 additions & 13 deletions Tests/SentryTests/Protocol/SentrySdkInfoTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions scripts/build-xcframework-slice.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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" \
Expand Down
Loading