Expose Sentry._Hybrid explicit module (#4440)

getsentry · Nov 18, 2024 · da7a50e · da7a50e
1 parent d689766
commit da7a50e
Show file tree

Hide file tree

Showing 23 changed files with 170 additions and 95 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -40,15 +40,15 @@ jobs:
 
   xcode-analyze:
     name: Xcode Analyze
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
-      - run: ./scripts/ci-select-xcode.sh
+      - run: ./scripts/ci-select-xcode.sh 15.0
       - run: make analyze
 
   lint-podspec:
     name: pod lint ${{ matrix.podspec}} ${{ matrix.library_type }} ${{ matrix.platform}}
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -58,19 +58,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - run: ./scripts/ci-select-xcode.sh
+      - run: ./scripts/ci-select-xcode.sh 15.0
       # We need to update the spec-repo, because it can happen that it is not up to date and then the lint fails.
       - run: pod repo update
       - name: Validate Podspec
         run: ./scripts/pod-lib-lint.sh ${{ matrix.platform }} ${{ matrix.podspec}} ${{ matrix.library_type}}
 
   lint-hybrid-sdk-podspec:
     name: pod lint Sentry/HybridSDK
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v4
-      - run: ./scripts/ci-select-xcode.sh
+      - run: ./scripts/ci-select-xcode.sh 15.0
       - run: pod repo update
       - name: Validate HybridPod Podspec
         run: pod lib lint ./Tests/HybridSDKTest/HybridPod.podspec --allow-warnings --verbose --platforms=ios "--include-podspecs={Sentry.podspec}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@
 - Finish TTFD when not calling reportFullyDisplayed before binding a new transaction to the scope (#4526).
 - Session replay opacity animation masking (#4532)
 
+### Improvements
+
+- Expose `Sentry._Hybrid` explicit module (#4440)
+
 ## 8.40.1
 
 ### Fixes

diff --git a/Samples/Carthage-Validation/XCFramework/XCFramework/AppDelegate.swift b/Samples/Carthage-Validation/XCFramework/XCFramework/AppDelegate.swift
@@ -1,4 +1,5 @@
 import Sentry
+import Sentry._Hybrid
 import UIKit
 
 @main
@@ -12,6 +13,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             options.sessionTrackingIntervalMillis = 5_000
         }
 
+        // Available through Sentry._Hybrid
+        print(PrivateSentrySDKOnly.getSdkName())
+
         return true
     }
 

diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -302,7 +302,6 @@
 		D8269A42274C095F00BD5BD5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		D8269A49274C096000BD5BD5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D8269A5C274C108100BD5BD5 /* iOS13-Swift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "iOS13-Swift.entitlements"; sourceTree = "<group>"; };
-		D82915932C889F1800A6CDD4 /* SentryCocoaPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SentryCocoaPrivate.h; sourceTree = "<group>"; };
 		D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "fatal-error-binary-images-message2.json"; path = "../../../Tests/Resources/fatal-error-binary-images-message2.json"; sourceTree = "<group>"; };
 		D840D520273A07F400CDF142 /* iOS-SwiftClip.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS-SwiftClip.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		D840D522273A07F400CDF142 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -624,7 +623,6 @@
 				D8F01DF02A1377D0008F4996 /* SentryExposure.h */,
 				D8832B192AF4FE2000C522B0 /* SentryUIApplication.h */,
 				629EC8AC2B0B537400858855 /* TriggerAppHang.swift */,
-				D82915932C889F1800A6CDD4 /* SentryCocoaPrivate.h */,
 				84BA71E32C8BBBEC0045B828 /* DSNDisplayViewController.swift */,
 				84BA71F02C8BC55A0045B828 /* Toasts.swift */,
 			);

diff --git a/Samples/iOS-Swift/iOS-Swift/Tools/SentryCocoaPrivate.h b/Samples/iOS-Swift/iOS-Swift/Tools/SentryCocoaPrivate.h
diff --git a/Samples/iOS-Swift/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h b/Samples/iOS-Swift/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h
@@ -1,5 +1,4 @@
 #import "SentryBenchmarking.h"
-#import "SentryCocoaPrivate.h"
 #import "SentryExposure.h"
 #import "SentryUIApplication.h"
 #import <Sentry/PrivateSentrySDKOnly.h>

diff --git a/Samples/iOS-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h b/Samples/iOS-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h
@@ -1,5 +1,4 @@
 #import "SentryBenchmarking.h"
-#import "SentryCocoaPrivate.h"
 #import "SentryUIApplication.h"
 #import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentrySDK+Private.h>