Merge pull request #1362 from DataDog/release/2.0.0-beta1

Pre-release `2.0.0-beta1`
DataDog · Jul 6, 2023 · a7451be · a7451be
2 parents 4726fe2 + ecb11fa
commit a7451be
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Unreleased
 
-# 1.21.0 / 27-07-2023
+# 1.21.0 / 27-06-2023
 - [BUGFIX] Fix TracingUUID string format. See [#1311][] (Thanks [@changm4n][])
 - [BUGFIX] Rename _Datadog_Private to DatadogPrivate. See [#1331] (Thanks [@alexfanatics][])
 - [IMPROVEMENT] Add context to crash when there's an active view. See [#1315][]

diff --git a/DatadogAlamofireExtension.podspec b/DatadogAlamofireExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogAlamofireExtension"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "An Official Extensions of Datadog Swift SDK for Alamofire."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogCore.podspec b/DatadogCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCore"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Swift SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogCore/Sources/Versioning.swift b/DatadogCore/Sources/Versioning.swift
@@ -1,3 +1,3 @@
 // GENERATED FILE: Do not edit directly
 
-internal let __sdkVersion = "2.0.0-alpha1"
+internal let __sdkVersion = "2.0.0-beta1"
diff --git a/DatadogCrashReporting.podspec b/DatadogCrashReporting.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogCrashReporting"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogInternal.podspec b/DatadogInternal.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogInternal"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog Internal Package. This module is not for public use."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogLogs.podspec b/DatadogLogs.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogLogs"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog Logs Module."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogObjc.podspec b/DatadogObjc.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogObjc"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Objective-C SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogRUM.podspec b/DatadogRUM.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogRUM"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog Real User Monitoring Module."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogSDK.podspec b/DatadogSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDK"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Swift SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogSDKAlamofireExtension.podspec b/DatadogSDKAlamofireExtension.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKAlamofireExtension"
   s.module_name  = "DatadogAlamofireExtension"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "An Official Extensions of Datadog Swift SDK for Alamofire."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogSDKCrashReporting.podspec b/DatadogSDKCrashReporting.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKCrashReporting"
   s.module_name  = "DatadogCrashReporting"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogSDKObjc.podspec b/DatadogSDKObjc.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKObjc"
   s.module_name  = "DatadogObjc"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Objective-C SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogSessionReplay.podspec b/DatadogSessionReplay.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSessionReplay"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Official Datadog Session Replay SDK for iOS. This module is currently in beta - contact Datadog to request a try."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogTrace.podspec b/DatadogTrace.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogTrace"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog Trace Module."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/DatadogWebViewTracking.podspec b/DatadogWebViewTracking.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogWebViewTracking"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog WebView Tracking Module."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/Package.swift b/Package.swift
@@ -29,10 +29,6 @@ let package = Package(
             name: "DatadogRUM",
             targets: ["DatadogRUM"]
         ),
-        .library(
-            name: "DatadogSessionReplay",
-            targets: ["DatadogSessionReplay"]
-        ),
         .library(
             name: "DatadogCrashReporting",
             targets: ["DatadogCrashReporting"]

diff --git a/TestUtilities.podspec b/TestUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "TestUtilities"
-  s.version      = "2.0.0-alpha1"
+  s.version      = "2.0.0-beta1"
   s.summary      = "Datadog Testing Utilities. This module is for internal testing and should not be published."
 
   s.homepage     = "https://www.datadoghq.com"

diff --git a/dependency-manager-tests/spm/App/ViewController.swift b/dependency-manager-tests/spm/App/ViewController.swift
@@ -10,9 +10,9 @@ import DatadogLogs
 import DatadogTrace
 import DatadogRUM
 import DatadogCrashReporting
-#if os(iOS)
-import DatadogSessionReplay
-#endif
+//#if os(iOS)
+//import DatadogSessionReplay
+//#endif
 
 internal class ViewController: UIViewController {
     private var logger: LoggerProtocol! // swiftlint:disable:this implicitly_unwrapped_optional
@@ -53,10 +53,10 @@ internal class ViewController: UIViewController {
         logger.info("It works")
         _ = Tracer.shared().startSpan(operationName: "this too")
 
-        #if os(iOS)
-        // Session Replay API must be visible:
-        SessionReplay.enable(with: .init(replaySampleRate: 0))
-        #endif
+//        #if os(iOS)
+//        // Session Replay API must be visible:
+//        SessionReplay.enable(with: .init(replaySampleRate: 0))
+//        #endif
 
         addLabel()
     }

diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		3CB7A04C29F6ABDA007A27ED /* DatadogWebViewTracking in Frameworks */ = {isa = PBXBuildFile; productRef = 3CB7A04B29F6ABDA007A27ED /* DatadogWebViewTracking */; };
-		618291CF2A4619C600100CA0 /* DatadogSessionReplay in Frameworks */ = {isa = PBXBuildFile; productRef = 618291CE2A4619C600100CA0 /* DatadogSessionReplay */; };
 		61C363DA24374D5F00C4D4E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */; };
 		61C363DC24374D5F00C4D4E6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */; };
 		61C363DE24374D5F00C4D4E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DD24374D5F00C4D4E6 /* ViewController.swift */; };
@@ -113,7 +112,6 @@
 				D2966C2E29CA1F2D00FC6B3C /* DatadogTrace in Frameworks */,
 				D2344E1F29ACDE61007F5BD2 /* DatadogLogs in Frameworks */,
 				D2CE76BC29F6B9EE00D79713 /* DatadogRUM in Frameworks */,
-				618291CF2A4619C600100CA0 /* DatadogSessionReplay in Frameworks */,
 				3CB7A04C29F6ABDA007A27ED /* DatadogWebViewTracking in Frameworks */,
 				9E73374026B0123500917C24 /* DatadogCrashReporting in Frameworks */,
 			);
@@ -257,7 +255,6 @@
 				D2966C2D29CA1F2D00FC6B3C /* DatadogTrace */,
 				D2CE76BB29F6B9EE00D79713 /* DatadogRUM */,
 				3CB7A04B29F6ABDA007A27ED /* DatadogWebViewTracking */,
-				618291CE2A4619C600100CA0 /* DatadogSessionReplay */,
 				D26A32D62A4C892A00903514 /* DatadogCore */,
 			);
 			productName = SPMProject;
@@ -1073,11 +1070,6 @@
 			package = 9E73373E26B0123500917C24 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */;
 			productName = DatadogWebViewTracking;
 		};
-		618291CE2A4619C600100CA0 /* DatadogSessionReplay */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9E73373E26B0123500917C24 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */;
-			productName = DatadogSessionReplay;
-		};
 		9E73373F26B0123500917C24 /* DatadogCrashReporting */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9E73373E26B0123500917C24 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */;