Merge f2fd179 into 87d0133

getsentry · Mar 26, 2024 · dd01832 · dd01832
2 parents 87d0133 + f2fd179
commit dd01832
Show file tree

Hide file tree

Showing 32 changed files with 987 additions and 199 deletions.
diff --git a/Package.swift b/Package.swift
@@ -12,13 +12,13 @@ let package = Package(
     targets: [
         .binaryTarget(
                     name: "Sentry",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.22.0-alpha.0/Sentry.xcframework.zip",
-                    checksum: "86156301aee5c8774a8cd5c240286f914f6e7721aaac5a7c9d049ea613a4b730" //Sentry-Static
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.22.4/Sentry.xcframework.zip",
+                    checksum: "0fb20e85ff8fe2fdfcf6add48bd510bccf113f7db3795931e1d8dc0dbbc6d46d" //Sentry-Static
                 ),
         .binaryTarget(
                     name: "Sentry-Dynamic",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.22.0-alpha.0/Sentry-Dynamic.xcframework.zip",
-                    checksum: "86156301aee5c8774a8cd5c240286f914f6e7721aaac5a7c9d049ea613a4b730" //Sentry-Dynamic
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.22.4/Sentry-Dynamic.xcframework.zip",
+                    checksum: "391cb3b9fe2e967383e9232c53daa547ca60a02b1515ff99da6515dbced165a5" //Sentry-Dynamic
                 ),
         .target ( name: "SentrySwiftUI",
                   dependencies: ["Sentry", "SentryInternal"],

diff --git a/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift
@@ -15,13 +15,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let dsn = DSNStorage.shared.getDSN() ?? AppDelegate.defaultDSN
         DSNStorage.shared.saveDSN(dsn: dsn)
 
-        SentrySDK.start { options in
+        SentrySDK.start(configureOptions: { options in
             options.dsn = dsn
             options.beforeSend = { event in
                 return event
             }
             options.debug = true
 
+            if #available(iOS 16.0, *) {
+                options.sessionReplayOptions = SentryReplayOptions(sessionSampleRate: 0, errorSampleRate: 1)
+            }
+
             if #available(iOS 15.0, *) {
                 options.enableMetricKit = true
             }
@@ -58,7 +62,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             options.sessionTrackingIntervalMillis = 5_000
             options.attachScreenshot = true
             options.attachViewHierarchy = true
-            
+
 #if targetEnvironment(simulator)
             options.enableSpotlight = true
             options.environment = "test-app"
@@ -127,7 +131,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 }
                 return scope
             }
-        }
+        })
     }
     //swiftlint:enable function_body_length
 

diff --git a/Sentry.podspec b/Sentry.podspec
@@ -1,50 +1,53 @@
 Pod::Spec.new do |s|
-  s.name         = "Sentry"
-  s.version      = "8.21.0"
-  s.summary      = "Sentry client for cocoa"
-  s.homepage     = "https://github.com/getsentry/sentry-cocoa"
-  s.license      = "mit"
-  s.authors      = "Sentry"
-  s.source       = { :git => "https://github.com/getsentry/sentry-cocoa.git",
-                     :tag => s.version.to_s }
-
-  s.ios.deployment_target = "11.0"
-  s.osx.deployment_target = "10.13"
-  s.tvos.deployment_target = "11.0"
-  s.watchos.deployment_target = "4.0"
-  s.visionos.deployment_target = "1.0"
-  s.module_name  = "Sentry"
-  s.requires_arc = true
-  s.frameworks = 'Foundation'
-  s.swift_versions = "5.5"
-  s.pod_target_xcconfig = {
-      'GCC_ENABLE_CPP_EXCEPTIONS' => 'YES',
-      'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
-      'CLANG_CXX_LIBRARY' => 'libc++',
-      'APPLICATION_EXTENSION_API_ONLY' => 'YES',
-      'SWIFT_INCLUDE_PATHS' => '${PODS_TARGET_SRCROOT}/Sources/Sentry/include'
-  }
-  s.watchos.pod_target_xcconfig = {
-      'OTHER_LDFLAGS' => '$(inherited) -framework WatchKit'
-  }
-
-  s.default_subspecs = ['Core']
-
-  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/**/*.{swift,h,hpp,m,mm,c,cpp}", "Sources/Sentry/include/module.modulemap"
-      sp.public_header_files =
+    s.name         = "Sentry"
+    s.version      = "8.21.0"
+    s.summary      = "Sentry client for cocoa"
+    s.homepage     = "https://github.com/getsentry/sentry-cocoa"
+    s.license      = "mit"
+    s.authors      = "Sentry"
+    s.source       = { :git => "https://github.com/getsentry/sentry-cocoa.git",
+        :tag => s.version.to_s }
+
+    s.ios.deployment_target = "11.0"
+    s.osx.deployment_target = "10.13"
+    s.tvos.deployment_target = "11.0"
+    s.watchos.deployment_target = "4.0"
+    s.visionos.deployment_target = "1.0"
+    s.module_name  = "Sentry"
+    s.requires_arc = true
+    s.frameworks = 'Foundation'
+    s.swift_versions = "5.5"
+    s.pod_target_xcconfig = {
+        'GCC_ENABLE_CPP_EXCEPTIONS' => 'YES',
+        'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
+        'CLANG_CXX_LIBRARY' => 'libc++',
+        'APPLICATION_EXTENSION_API_ONLY' => 'YES',
+        'SWIFT_INCLUDE_PATHS' => '${PODS_TARGET_SRCROOT}/Sources/Sentry/include'
+    }
+    s.watchos.pod_target_xcconfig = {
+        'OTHER_LDFLAGS' => '$(inherited) -framework WatchKit'
+    }
+
+    s.default_subspecs = ['Core']
+
+    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/**/*.{swift,h,hpp,m,mm,c,cpp}"
+
+        sp.preserve_path = "Sources/Sentry/include/module.modulemap"
+        sp.public_header_files =
         "Sources/Sentry/Public/*.h"
-      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}",
+        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 =
+        sp.preserve_path = "Sources/Sentry/include/module.modulemap"
+        sp.public_header_files =
         "Sources/Sentry/Public/*.h", "Sources/Sentry/include/HybridPublic/*.h"
-
-      sp.resource_bundles = { "Sentry" => "Sources/Resources/PrivacyInfo.xcprivacy" }
-  end
+        
+        sp.resource_bundles = { "Sentry" => "Sources/Resources/PrivacyInfo.xcprivacy" }
+    end
 end