ref: Remove SentryPrivate

.github/workflows/lint.yml

@@ -71,4 +71,4 @@ jobs:
       - run: ./scripts/ci-select-xcode.sh
       - run: pod repo update
       - name: Validate HybridPod Podspec
-        run: pod lib lint ./Tests/HybridSDKTest/HybridPod.podspec --allow-warnings --verbose --platforms=ios "--include-podspecs={SentryPrivate.podspec,Sentry.podspec}"
+        run: pod lib lint ./Tests/HybridSDKTest/HybridPod.podspec --allow-warnings --verbose --platforms=ios "--include-podspecs={Sentry.podspec}"

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Improvements
 
 - Cache installationID async to avoid file IO on the main thread when starting the SDK (#3601)
+- Remove SentryPrivate from Carthage and self build (#3623)
 
 ### Fixes
 

Sentry.podspec

@@ -27,19 +27,18 @@ Pod::Spec.new do |s|
   }
 
   s.default_subspecs = ['Core']
-  s.dependency "SentryPrivate", "8.20.0"
 
   s.subspec 'Core' do |sp|
       sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",
-        "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/Sentry.swift"
+        "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/**/*.{swift,h,hpp,m,mm,c,cpp}"
       sp.public_header_files =
         "Sources/Sentry/Public/*.h"
       sp.resource = "Sources/Resources/PrivacyInfo.xcprivacy"
   end
 
   s.subspec 'HybridSDK' do |sp|
       sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",
-        "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/Sentry.swift"
+        "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/**/*.{swift,h,hpp,m,mm,c,cpp}"
 
       sp.public_header_files =
         "Sources/Sentry/Public/*.h", "Sources/Sentry/include/HybridPublic/*.h"

SentryPrivate.podspec

@@ -8,6 +8,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/getsentry/sentry-cocoa.git",
                      :tag => s.version.to_s }
   s.social_media_url = 'https://getsentry.com/'
+  s.deprecated = true
 
   s.description      = <<-DESC
    Not for public use.

Sources/Sentry/SentryCoreDataTracker.m

@@ -8,10 +8,10 @@
 #import "SentryPredicateDescriptor.h"
 #import "SentrySDK+Private.h"
 #import "SentryScope+Private.h"
-#import "SentrySpanProtocol.h"
-@import SentryPrivate;
 #import "SentrySpan.h"
+#import "SentrySpanProtocol.h"
 #import "SentryStacktrace.h"
+#import "SentrySwift.h"
 #import "SentryThreadInspector.h"
 #import "SentryTraceOrigins.h"
 

Sources/Sentry/SentryNetworkTracker.m

@@ -17,6 +17,7 @@
 #import "SentryScope+Private.h"
 #import "SentrySerialization.h"
 #import "SentryStacktrace.h"
+#import "SentrySwift.h"
 #import "SentryThread.h"
 #import "SentryThreadInspector.h"
 #import "SentryTraceContext.h"
@@ -25,7 +26,6 @@
 #import "SentryTracer.h"
 #import "SentryUser.h"
 #import <objc/runtime.h>
-@import SentryPrivate;
 
 /**
  * WARNING: We had issues in the past with this code on older iOS versions. We don't run unit tests

Sources/Sentry/SentryTracer.m

@@ -16,6 +16,7 @@
 #import "SentrySpanContext+Private.h"
 #import "SentrySpanContext.h"
 #import "SentrySpanId.h"
+#import "SentrySwift.h"
 #import "SentryThreadWrapper.h"
 #import "SentryTime.h"
 #import "SentryTraceContext.h"
@@ -28,7 +29,6 @@
 #import <SentryDispatchQueueWrapper.h>
 #import <SentryMeasurementValue.h>
 #import <SentrySpanOperations.h>
-@import SentryPrivate;
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 #    import "SentryProfiledTracerConcurrency.h"

Sources/Sentry/SentryUIApplication.m

@@ -1,8 +1,8 @@
 #import "SentryUIApplication.h"
 #import "SentryDependencyContainer.h"
 #import "SentryDispatchQueueWrapper.h"
-@import SentryPrivate;
 #import "SentryNSNotificationCenterWrapper.h"
+#import "SentrySwift.h"
 
 #if SENTRY_HAS_UIKIT
 

Sources/Sentry/SentryViewHierarchy.m

@@ -7,11 +7,10 @@
 #    import "SentryDependencyContainer.h"
 #    import "SentryDispatchQueueWrapper.h"
 #    import "SentryLog.h"
+#    import "SentrySwift.h"
 #    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 
-@import SentryPrivate;
-
 static int
 writeJSONDataToFile(const char *const data, const int length, void *const userData)
 {

Sources/Sentry/include/SentrySwift.h

@@ -1,6 +1,12 @@
 #ifndef SentrySwift_h
 #define SentrySwift_h
 
+#if SWIFT_PACKAGE
 @import SentryPrivate;
+#elif __has_include("Sentry-Swift.h")
+#    import "Sentry-Swift.h"
+#else
+#    import "Sentry/Sentry-Swift.h"
+#endif
 
 #endif

Tests/SentryTests/Integrations/MetricKit/SentryMXCallStackTreeTests.swift

@@ -1,5 +1,4 @@
 #if os(iOS) || os(macOS)
-import SentryPrivate
 import XCTest
 
 /**

Tests/SentryTests/Integrations/MetricKit/SentryMXManagerTests.swift

@@ -165,23 +165,23 @@ class TestMXDiagnosticPayload: MXDiagnosticPayload {
 @available(watchOS, unavailable)
 class SentryMXManagerTestDelegate: SentryMXManagerDelegate {
 
-    var crashInvocations = Invocations<(diagnostic: MXCrashDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
-    func didReceiveCrashDiagnostic(_ diagnostic: MXCrashDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
+    var crashInvocations = Invocations<(diagnostic: MXCrashDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
+    func didReceiveCrashDiagnostic(_ diagnostic: MXCrashDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
         crashInvocations.record((diagnostic, callStackTree, timeStampBegin, timeStampEnd))
     }
 
-    var diskWriteExceptionInvocations = Invocations<(diagnostic: MXDiskWriteExceptionDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
-    func didReceiveDiskWriteExceptionDiagnostic(_ diagnostic: MXDiskWriteExceptionDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
+    var diskWriteExceptionInvocations = Invocations<(diagnostic: MXDiskWriteExceptionDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
+    func didReceiveDiskWriteExceptionDiagnostic(_ diagnostic: MXDiskWriteExceptionDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
         diskWriteExceptionInvocations.record((diagnostic, callStackTree, timeStampBegin, timeStampEnd))
     }
 
-    var cpuExceptionInvocations = Invocations<(diagnostic: MXCPUExceptionDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
-    func didReceiveCpuExceptionDiagnostic(_ diagnostic: MXCPUExceptionDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
+    var cpuExceptionInvocations = Invocations<(diagnostic: MXCPUExceptionDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
+    func didReceiveCpuExceptionDiagnostic(_ diagnostic: MXCPUExceptionDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
         cpuExceptionInvocations.record((diagnostic, callStackTree, timeStampBegin, timeStampEnd))
     }
 
-    var hangDiagnosticInvocations = Invocations<(diagnostic: MXHangDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
-    func didReceiveHangDiagnostic(_ diagnostic: MXHangDiagnostic, callStackTree: SentryPrivate.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
+    var hangDiagnosticInvocations = Invocations<(diagnostic: MXHangDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)>()
+    func didReceiveHangDiagnostic(_ diagnostic: MXHangDiagnostic, callStackTree: Sentry.SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date) {
         hangDiagnosticInvocations.record((diagnostic, callStackTree, timeStampBegin, timeStampEnd))
     }
 }

Tests/SentryTests/Integrations/MetricKit/SentryMetricKitIntegrationTests.swift

@@ -1,5 +1,4 @@
 import Sentry
-import SentryPrivate
 import SentryTestUtils
 import XCTest
 

Tests/SentryTests/SentryTests-Bridging-Header.h

@@ -167,6 +167,18 @@
 #import "SentrySdkInfo.h"
 #import "SentrySwiftAsyncIntegration.h"
 
+#import "Sentry/Sentry-Swift.h"
+#import "SentryBinaryImageCache+Private.h"
+#import "SentryCrashBinaryImageCache.h"
+#import "SentryDispatchFactory.h"
+#import "SentryDispatchSourceWrapper.h"
+#import "SentryEnvelopeAttachmentHeader.h"
+#import "SentryExtraContextProvider.h"
+#import "SentryMeasurementValue.h"
+#import "SentryNSProcessInfoWrapper.h"
+#import "SentryPerformanceTracker+Testing.h"
+#import "SentryPropagationContext.h"
+#import "SentrySampleDecision+Private.h"
 #import "SentrySerialization.h"
 #import "SentrySession+Private.h"
 #import "SentrySessionTracker.h"
@@ -186,9 +198,11 @@
 #import "SentryThreadInspector.h"
 #import "SentryThreadWrapper.h"
 #import "SentryTime.h"
+#import "SentryTimeToDisplayTracker.h"
 #import "SentryTraceContext.h"
 #import "SentryTracer+Private.h"
 #import "SentryTracer+Test.h"
+#import "SentryTracerConfiguration.h"
 #import "SentryTransaction.h"
 #import "SentryTransactionContext+Private.h"
 #import "SentryTransport.h"
@@ -204,20 +218,5 @@
 #import "TestNSURLRequestBuilder.h"
 #import "TestSentryCrashWrapper.h"
 #import "TestSentrySpan.h"
-#import "URLSessionTaskMock.h"
-@import SentryPrivate;
-#import "SentryBinaryImageCache+Private.h"
-#import "SentryCrashBinaryImageCache.h"
-#import "SentryDispatchFactory.h"
-#import "SentryDispatchSourceWrapper.h"
-#import "SentryEnvelopeAttachmentHeader.h"
-#import "SentryExtraContextProvider.h"
-#import "SentryMeasurementValue.h"
-#import "SentryNSProcessInfoWrapper.h"
-#import "SentryPerformanceTracker+Testing.h"
-#import "SentryPropagationContext.h"
-#import "SentrySampleDecision+Private.h"
-#import "SentrySpanOperations.h"
-#import "SentryTimeToDisplayTracker.h"
-#import "SentryTracerConfiguration.h"
 #import "TestSentryViewHierarchy.h"
+#import "URLSessionTaskMock.h"

Tests/SentryTests/UrlSanitizedTests.swift

@@ -1,5 +1,4 @@
 import Foundation
-import SentryPrivate
 import XCTest
 
 class UrlSanitizedTests: XCTestCase {

scripts/pod-lib-lint.sh

@@ -10,11 +10,11 @@ EXTRA_ARGS=""
 case $POD_SPEC in
 
 "Sentry")
-    INCLUDE_POD_SPECS="--include-podspecs=SentryPrivate.podspec"
+    INCLUDE_POD_SPECS=""
     ;;
 
 "SentrySwiftUI")
-    INCLUDE_POD_SPECS="--include-podspecs={Sentry.podspec,SentryPrivate.podspec}"
+    INCLUDE_POD_SPECS="--include-podspecs=Sentry.podspec"
     ;;
 
 *)
@@ -33,4 +33,4 @@ case $LIBRARY_TYPE in
     ;;
 esac
 
-pod lib lint --verbose --platforms="$PLATFORM" "$POD_SPEC".podspec "$INCLUDE_POD_SPECS" $EXTRA_ARGS
+pod lib lint --verbose --platforms="$PLATFORM" "$POD_SPEC".podspec $INCLUDE_POD_SPECS $EXTRA_ARGS