chore: Removes HybridSDK subspec

.github/file-filters.yml

@@ -142,7 +142,6 @@ run_test_cross_platform_for_prs: &run_test_cross_platform_for_prs
   - "Sentry.podspec"
   - "SentrySwiftUI.podspec"
   - "Package*.swift"
-  - "Tests/HybridSDKTest/HybridPod.podspec"
 
   # Scripts
   - "scripts/ci-select-xcode.sh"
@@ -230,7 +229,6 @@ run_lint_cocoapods_specs_for_prs: &run_lint_cocoapods_specs_for_prs
   # Project files
   - "Sentry.xcodeproj/**"
   - "*.podspec"
-  - "Tests/HybridSDKTest/HybridPod.podspec"
 
   # Build configuration
   - "Makefile"
@@ -417,7 +415,6 @@ run_version_bump_util_for_prs: &run_version_bump_util_for_prs
   - "Sentry.podspec"
   - "SentrySwiftUI.podspec"
   - "Package*.swift"
-  - "Tests/HybridSDKTest/HybridPod.podspec"
 
   # Configuration files
   - "Sources/Configuration/SDK.xcconfig"

.github/workflows/lint-cocoapods-specs.yml

@@ -59,29 +59,11 @@ jobs:
         if: failure()
         run: ./scripts/ci-diagnostics.sh
 
-  lint-hybrid-sdk-podspec:
-    name: Sentry/HybridSDK
-    # Run the job only for PRs with related changes or non-PR events.
-    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_lint_cocoapods_specs_for_prs == 'true'
-    needs: files-changed
-    runs-on: macos-15
-
-    steps:
-      - uses: actions/checkout@v6
-      - run: ./scripts/ci-select-xcode.sh 16.4
-      - 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}"
-      - name: Run CI Diagnostics
-        if: failure()
-        run: ./scripts/ci-diagnostics.sh
-
   lint_cocoapods_Specs-required-check:
     needs:
       [
         files-changed,
         lint-podspec,
-        lint-hybrid-sdk-podspec,
       ]
     name: Lint CocoaPods Specs
     # This is necessary since a failed/skipped dependent job would cause this job to be skipped

.github/workflows/test-cross-platform.yml

@@ -57,7 +57,7 @@ jobs:
         with:
           repository: getsentry/sentry-react-native
           path: sentry-react-native
-          ref: cocoa-v9
+          ref: itay/use_regular_podspec
 
       - name: Enable Corepack
         working-directory: sentry-react-native
@@ -85,11 +85,11 @@ jobs:
         working-directory: sentry-react-native
         run: yarn install
 
-      - name: Remove Sentry/HybridSDK Dependency from RNSentry.podspec
-        run: sed -i '' "s/s.dependency 'Sentry\/HybridSDK', '[0-9]*\.[0-9]*\.[0-9]*'/s.dependency 'Sentry\/HybridSDK'/" sentry-react-native/packages/core/RNSentry.podspec
+      - name: Remove fixed version of Sentry Dependency from RNSentry.podspec
+        run: sed -i '' "s/s.dependency 'Sentry', '[0-9]*\.[0-9]*\.[0-9]*'/s.dependency 'Sentry'/" sentry-react-native/packages/core/RNSentry.podspec
 
-      - name: Add Sentry/HybridSDK Dependency to RNSentryCocoaTester/Podfile
-        run: sed -i '' -e "s/RNSentry.podspec'/RNSentry.podspec'\\n  pod 'Sentry\/HybridSDK', :path => '..\/..\/..\/..\/sentry-cocoa'/" sentry-react-native/packages/core/RNSentryCocoaTester/Podfile
+      - name: Add Sentry Dependency with path to Sentry Cocoa SDK to RNSentryCocoaTester/Podfile
+        run: sed -i '' -e "s/RNSentry.podspec'/RNSentry.podspec'\\n  pod 'Sentry', :path => '..\/..\/..\/..\/sentry-cocoa'/" sentry-react-native/packages/core/RNSentryCocoaTester/Podfile
 
       - name: Disable test parallelization
         working-directory: sentry-react-native/packages/core/RNSentryCocoaTester

Package.swift

@@ -87,8 +87,7 @@ var targets: [Target] = [
             dependencies: ["SentryHeaders"],
             path: "Sources/Sentry",
             sources: ["SentryDummyPrivateEmptyClass.m"],
-            publicHeadersPath: "include",
-            cSettings: [.headerSearchPath("include/HybridPublic")]),
+            publicHeadersPath: "include"),
         .target(
             name: "SentrySwift",
             dependencies: ["_SentryPrivate", "SentryHeaders"],
@@ -102,7 +101,6 @@ var targets: [Target] = [
             path: "Sources",
             exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"],
             cSettings: [
-                .headerSearchPath("Sentry/include/HybridPublic"),
                 .headerSearchPath("Sentry"),
                 .headerSearchPath("SentryCrash/Recording"),
                 .headerSearchPath("SentryCrash/Recording/Monitors"),

Samples/XCFramework-Validation/XCFramework/AppDelegate.swift

@@ -1,5 +1,4 @@
 import Sentry
-import Sentry._Hybrid
 import UIKit
 
 @main
@@ -13,7 +12,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             options.sessionTrackingIntervalMillis = 5_000
         }
 
-        // Available through Sentry._Hybrid
         print(PrivateSentrySDKOnly.getSdkName())
 
         return true

Samples/iOS-SwiftUI/iOS-SwiftUI.yml

@@ -31,7 +31,7 @@ targets:
       - ../../Sources/Sentry/Public/SentrySerializable.h
       - ../../Sources/Sentry/include/SentryTracer.h
       - ../../Sources/Sentry/include/SentryPerformanceTracker.h
-      - ../../Sources/Sentry/include/HybridPublic/SentryProfilingConditionals.h
+      - ../../Sources/Sentry/Public/SentryProfilingConditionals.h
     dependencies:
       - target: Sentry/Sentry
       - target: Sentry/SentrySwiftUI

Sentry.podspec

@@ -39,13 +39,4 @@ Pod::Spec.new do |s|
       sp.preserve_path = "Sources/Sentry/include/module.modulemap"
       sp.resource_bundles = { "Sentry" => "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/**/*.{swift,h,hpp,m,mm,c,cpp}"
-      sp.public_header_files =
-        "Sources/Sentry/Public/*.h", "Sources/Sentry/include/HybridPublic/*.h"
-      sp.preserve_path = "Sources/Sentry/include/module.modulemap"
-      sp.resource_bundles = { "Sentry" => "Sources/Resources/PrivacyInfo.xcprivacy" }
-  end
 end