chore: Making Hybrid SDK only header private for everybody else (#2458)

Exposing some headers to hybridSDK only.

Package.swift

@@ -27,6 +27,7 @@ let package = Package(
             cxxSettings: [
                 .define("GCC_ENABLE_CPP_EXCEPTIONS", to: "YES"),
                 .headerSearchPath("Sentry/include"),
+                .headerSearchPath("Sentry/include/HybridPublic"),
                 .headerSearchPath("Sentry/Public"),
                 .headerSearchPath("SentryCrash/Installations"),
                 .headerSearchPath("SentryCrash/Recording"),

Sentry.podspec

@@ -41,6 +41,6 @@ Pod::Spec.new do |s|
         "Sources/SentryCrash/**/*.{h,hpp,m,mm,c,cpp}", "Sources/Swift/Sentry.swift"
 
       sp.public_header_files =
-        "Sources/Sentry/Public/*.h", "Sources/Sentry/include/PrivateSentrySDKOnly.h"
+        "Sources/Sentry/Public/*.h", "Sources/Sentry/include/HybridPublic/*.h"
   end
 end

Sources/Sentry/Public/Sentry.h

@@ -6,7 +6,6 @@ FOUNDATION_EXPORT double SentryVersionNumber;
 //! Project version string for Sentry.
 FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 
-#import "SentryAppStartMeasurement.h"
 #import "SentryAttachment.h"
 #import "SentryBreadcrumb.h"
 #import "SentryClient.h"
@@ -15,8 +14,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #import "SentryDebugMeta.h"
 #import "SentryDefines.h"
 #import "SentryDsn.h"
-#import "SentryEnvelope.h"
-#import "SentryEnvelopeItemType.h"
 #import "SentryError.h"
 #import "SentryEvent.h"
 #import "SentryException.h"
@@ -36,7 +33,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #import "SentrySampleDecision.h"
 #import "SentrySamplingContext.h"
 #import "SentryScope.h"
-#import "SentryScreenFrames.h"
 #import "SentrySdkInfo.h"
 #import "SentrySerializable.h"
 #import "SentrySession.h"

Sources/Sentry/include/PrivateSentrySDKOnly.h → Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h

@@ -1,11 +1,8 @@
-// We need this because if Sentry library is added as a Framework
-// the reference should be in the form of <module/header>.
-// Otherwise, the reference is direct.
-#if __has_include(<Sentry/SentryDefines.h>)
-#    import <Sentry/SentryDefines.h>
-#else
-#    import "SentryDefines.h"
-#endif
+#import "PrivatesHeader.h"
+#import "SentryAppStartMeasurement.h"
+#import "SentryEnvelope.h"
+#import "SentryEnvelopeItemType.h"
+#import "SentryScreenFrames.h"
 
 @class SentryEnvelope, SentryDebugMeta, SentryAppStartMeasurement, SentryScreenFrames,
     SentryOptions;

Sources/Sentry/include/HybridPublic/PrivatesHeader.h

@@ -0,0 +1,14 @@
+// We need this because if Sentry library is added as a Framework
+// the reference should be in the form of <module/header>.
+// Otherwise, the reference is direct.
+#if __has_include(<Sentry/SentryDefines.h>)
+#    import <Sentry/SentryDefines.h>
+#else
+#    import "SentryDefines.h"
+#endif
+
+#if __has_include(<Sentry/SentryProfilingConditionals.h>)
+#    import <Sentry/SentryProfilingConditionals.h>
+#else
+#    import "SentryProfilingConditionals.h"
+#endif

Sources/Sentry/Public/SentryAppStartMeasurement.h → Sources/Sentry/include/HybridPublic/SentryAppStartMeasurement.h

@@ -1,4 +1,4 @@
-#import "SentryDefines.h"
+#import "PrivatesHeader.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/Sentry/Public/SentryEnvelope.h → Sources/Sentry/include/HybridPublic/SentryEnvelope.h

@@ -1,7 +1,6 @@
+#import "PrivatesHeader.h"
 #import <Foundation/Foundation.h>
 
-#import "SentryDefines.h"
-
 @class SentryEvent, SentrySession, SentrySdkInfo, SentryId, SentryUserFeedback, SentryAttachment,
     SentryTransaction, SentryTraceContext, SentryClientReport;
 

Sources/Sentry/Public/SentryScreenFrames.h → Sources/Sentry/include/HybridPublic/SentryScreenFrames.h

@@ -1,5 +1,4 @@
-#import "SentryDefines.h"
-#import "SentryProfilingConditionals.h"
+#import "PrivatesHeader.h"
 
 NS_ASSUME_NONNULL_BEGIN