Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RUM-5451] Bump iOS SDK to v2.14.1 #703

Merged
merged 2 commits into from
Jul 22, 2024
Merged

[RUM-5451] Bump iOS SDK to v2.14.1 #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9378cf5
Bump iOS SDK to v2.14.1
marco-saia-datadog Jul 18, 2024
bb87d6c
Updated Gemfile.lock and Podfile.lock files
marco-saia-datadog Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions example-new-architecture/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEM
base64
nkf
rexml
activesupport (7.0.5)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
Expand Down Expand Up @@ -56,27 +56,29 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.18.0)
json (2.7.2)
minitest (5.24.1)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
rexml (3.2.9)
strscan
ruby-macho (2.5.1)
strscan (3.1.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
Expand All @@ -97,7 +99,7 @@ DEPENDENCIES
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 2.7.5p203
ruby 3.2.2p53

BUNDLED WITH
2.4.13
2.4.10
56 changes: 28 additions & 28 deletions example-new-architecture/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
PODS:
- boost (1.83.0)
- CocoaAsyncSocket (7.6.5)
- DatadogCore (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogCrashReporting (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogCore (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogCrashReporting (2.14.1):
- DatadogInternal (= 2.14.1)
- PLCrashReporter (~> 1.11.2)
- DatadogInternal (2.13.0)
- DatadogLogs (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogRUM (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogInternal (2.14.1)
- DatadogLogs (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogRUM (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogSDKReactNative (2.4.1):
- DatadogCore (~> 2.13.0)
- DatadogCrashReporting (~> 2.13.0)
- DatadogLogs (~> 2.13.0)
- DatadogRUM (~> 2.13.0)
- DatadogTrace (~> 2.13.0)
- DatadogWebViewTracking (~> 2.13.0)
- DatadogCore (~> 2.14.1)
- DatadogCrashReporting (~> 2.14.1)
- DatadogLogs (~> 2.14.1)
- DatadogRUM (~> 2.14.1)
- DatadogTrace (~> 2.14.1)
- DatadogWebViewTracking (~> 2.14.1)
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
Expand All @@ -36,11 +36,11 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- DatadogTrace (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogTrace (2.14.1):
- DatadogInternal (= 2.14.1)
- OpenTelemetrySwiftApi (= 1.6.0)
- DatadogWebViewTracking (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogWebViewTracking (2.14.1):
- DatadogInternal (= 2.14.1)
- DoubleConversion (1.1.6)
- FBLazyVector (0.73.6)
- Flipper (0.201.0):
Expand Down Expand Up @@ -1411,14 +1411,14 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DatadogCore: 9390fd07a89f57a23983de66fbec5bf3c2034f7a
DatadogCrashReporting: 79b67b790df186524fc76d45c0b8ce751c36ef41
DatadogInternal: 61ab12516d2faad79e35973534c29a72b0d44382
DatadogLogs: 912d7b3fd3d75df856de060082b785f92f7cefe6
DatadogRUM: b5629479d4553d80f2a57ef9db44ce37e56f8b97
DatadogSDKReactNative: 19af4558894a7670285348949a294c02850dd79f
DatadogTrace: 1f40893de00c9a9b87be46fa7016fa0d50c4e66b
DatadogWebViewTracking: d1e2e755bb2ed7c18208471b9cbcfc7cb920aa45
DatadogCore: c0591cad03f97673dc6f9b1c56f85a81fc0868c6
DatadogCrashReporting: b18e2eb9f9e4c91a2acd38451ca86a5c9fe7e9d8
DatadogInternal: 9d326664fe7aaef4c159aaf19a32cd2675b4c5fe
DatadogLogs: d97eff8fba4541fad3bfaa8e8bcf8a272d246537
DatadogRUM: 2c4d698619557aad6bf031178a046a70799b561d
DatadogSDKReactNative: 5fe944d29e8f376d82c0ee920b1b4985028e9cf2
DatadogTrace: 18adb831078595a21210fdb7aad1db379e90dac1
DatadogWebViewTracking: 5306fb6a663df6c1579c2eacf95c95d05735bb18
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Expand Down Expand Up @@ -1486,4 +1486,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: acc878fa62d12f0e947079ca1aa621551b3699ee

COCOAPODS: 1.15.2
COCOAPODS: 1.14.3
24 changes: 13 additions & 11 deletions example/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEM
base64
nkf
rexml
activesupport (7.0.8.1)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
Expand Down Expand Up @@ -56,27 +56,29 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.22.3)
json (2.7.2)
minitest (5.24.1)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
rexml (3.2.9)
strscan
ruby-macho (2.5.1)
strscan (3.1.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
Expand All @@ -97,7 +99,7 @@ DEPENDENCIES
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 2.7.5p203
ruby 3.2.2p53

BUNDLED WITH
2.1.4
2.4.10
80 changes: 40 additions & 40 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
PODS:
- boost (1.83.0)
- DatadogCore (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogCrashReporting (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogCore (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogCrashReporting (2.14.1):
- DatadogInternal (= 2.14.1)
- PLCrashReporter (~> 1.11.2)
- DatadogInternal (2.13.0)
- DatadogLogs (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogRUM (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogInternal (2.14.1)
- DatadogLogs (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogRUM (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogSDKReactNative (2.4.1):
- DatadogCore (~> 2.13.0)
- DatadogCrashReporting (~> 2.13.0)
- DatadogLogs (~> 2.13.0)
- DatadogRUM (~> 2.13.0)
- DatadogTrace (~> 2.13.0)
- DatadogWebViewTracking (~> 2.13.0)
- DatadogCore (~> 2.14.1)
- DatadogCrashReporting (~> 2.14.1)
- DatadogLogs (~> 2.14.1)
- DatadogRUM (~> 2.14.1)
- DatadogTrace (~> 2.14.1)
- DatadogWebViewTracking (~> 2.14.1)
- React-Core
- DatadogSDKReactNative/Tests (2.4.1):
- DatadogCore (~> 2.13.0)
- DatadogCrashReporting (~> 2.13.0)
- DatadogLogs (~> 2.13.0)
- DatadogRUM (~> 2.13.0)
- DatadogTrace (~> 2.13.0)
- DatadogWebViewTracking (~> 2.13.0)
- DatadogCore (~> 2.14.1)
- DatadogCrashReporting (~> 2.14.1)
- DatadogLogs (~> 2.14.1)
- DatadogRUM (~> 2.14.1)
- DatadogTrace (~> 2.14.1)
- DatadogWebViewTracking (~> 2.14.1)
- React-Core
- DatadogSDKReactNativeSessionReplay (2.4.1-alpha.0):
- DatadogSDKReactNative
- DatadogSessionReplay (~> 2.13.0)
- DatadogSessionReplay (~> 2.14.1)
- React-Core
- DatadogSDKReactNativeSessionReplay/Tests (2.4.1-alpha.0):
- DatadogSDKReactNative
- DatadogSessionReplay (~> 2.13.0)
- DatadogSessionReplay (~> 2.14.1)
- React-Core
- React-RCTText
- DatadogSessionReplay (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogTrace (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogSessionReplay (2.14.1):
- DatadogInternal (= 2.14.1)
- DatadogTrace (2.14.1):
- DatadogInternal (= 2.14.1)
- OpenTelemetrySwiftApi (= 1.6.0)
- DatadogWebViewTracking (2.13.0):
- DatadogInternal (= 2.13.0)
- DatadogWebViewTracking (2.14.1):
- DatadogInternal (= 2.14.1)
- DoubleConversion (1.1.6)
- FBLazyVector (0.73.9)
- FBReactNativeSpec (0.73.9):
Expand Down Expand Up @@ -1326,16 +1326,16 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
DatadogCore: 9390fd07a89f57a23983de66fbec5bf3c2034f7a
DatadogCrashReporting: 79b67b790df186524fc76d45c0b8ce751c36ef41
DatadogInternal: 61ab12516d2faad79e35973534c29a72b0d44382
DatadogLogs: 912d7b3fd3d75df856de060082b785f92f7cefe6
DatadogRUM: b5629479d4553d80f2a57ef9db44ce37e56f8b97
DatadogSDKReactNative: 0101462ddda14f13470dfe05cca244c190bb1fac
DatadogSDKReactNativeSessionReplay: 001da6d4a0c0d3720c290d34b1bb1239c92ec198
DatadogSessionReplay: 2e7795c1a8a86ff989ed5c0ccd616eed0f6c9a3a
DatadogTrace: 1f40893de00c9a9b87be46fa7016fa0d50c4e66b
DatadogWebViewTracking: d1e2e755bb2ed7c18208471b9cbcfc7cb920aa45
DatadogCore: c0591cad03f97673dc6f9b1c56f85a81fc0868c6
DatadogCrashReporting: b18e2eb9f9e4c91a2acd38451ca86a5c9fe7e9d8
DatadogInternal: 9d326664fe7aaef4c159aaf19a32cd2675b4c5fe
DatadogLogs: d97eff8fba4541fad3bfaa8e8bcf8a272d246537
DatadogRUM: 2c4d698619557aad6bf031178a046a70799b561d
DatadogSDKReactNative: b8c3d66cacacabdcb8859412c232d2cc39e2a71f
DatadogSDKReactNativeSessionReplay: 6178d72df530a9cdc963b3870354ce548645d3ae
DatadogSessionReplay: 1a9597ff672b32a2b7cb1bed24fa29a584386807
DatadogTrace: 18adb831078595a21210fdb7aad1db379e90dac1
DatadogWebViewTracking: 5306fb6a663df6c1579c2eacf95c95d05735bb18
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FBLazyVector: 98c189b92292d4bfeac13ffa8df3ce3d84e2fc5b
FBReactNativeSpec: 4fe1d8c2fadc7949344b197d933f76b40401aac5
Expand Down Expand Up @@ -1399,4 +1399,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: d1c28e31d36be3f711ff8b7f62be08140e301d83

COCOAPODS: 1.15.2
COCOAPODS: 1.14.3
12 changes: 6 additions & 6 deletions packages/core/DatadogSDKReactNative.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Pod::Spec.new do |s|
s.dependency "React-Core"

# /!\ Remember to keep the versions in sync with DatadogSDKReactNativeSessionReplay.podspec
s.dependency 'DatadogCore', '~> 2.13.0'
s.dependency 'DatadogLogs', '~> 2.13.0'
s.dependency 'DatadogTrace', '~> 2.13.0'
s.dependency 'DatadogRUM', '~> 2.13.0'
s.dependency 'DatadogCrashReporting', '~> 2.13.0'
s.dependency 'DatadogWebViewTracking', '~> 2.13.0'
s.dependency 'DatadogCore', '~> 2.14.1'
s.dependency 'DatadogLogs', '~> 2.14.1'
s.dependency 'DatadogTrace', '~> 2.14.1'
s.dependency 'DatadogRUM', '~> 2.14.1'
s.dependency 'DatadogCrashReporting', '~> 2.14.1'
s.dependency 'DatadogWebViewTracking', '~> 2.14.1'

s.test_spec 'Tests' do |test_spec|
test_spec.source_files = 'ios/Tests/**/*.{swift,json}'
Expand Down
4 changes: 4 additions & 0 deletions packages/core/ios/Tests/MockDatadogCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,9 @@ internal class MockDatadogCore: DatadogCoreProtocol {
func set(baggage: @escaping () -> DatadogInternal.FeatureBaggage?, forKey key: String) {
baggages[key] = baggage
}

func mostRecentModifiedFileAt(before: Date) throws -> Date? {
return nil
}
}

4 changes: 4 additions & 0 deletions packages/internal-testing-tools/ios/Sources/DatadogCoreProxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ internal class DatadogCoreProxy: DatadogCoreProtocol {
func send(message: FeatureMessage, else fallback: @escaping () -> Void) {
core.send(message: message, else: fallback)
}

func mostRecentModifiedFileAt(before: Date) throws -> Date? {
return try core.mostRecentModifiedFileAt(before: before)
}
}

private struct FeatureScopeProxy: FeatureScope {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.dependency "React-Core"

# /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec
s.dependency 'DatadogSessionReplay', '~> 2.13.0'
s.dependency 'DatadogSessionReplay', '~> 2.14.1'
s.dependency 'DatadogSDKReactNative'

s.test_spec 'Tests' do |test_spec|
Expand Down
4 changes: 4 additions & 0 deletions packages/react-native-session-replay/ios/Tests/DdSessionReplayTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ private class MockSessionReplay: SessionReplayProtocol {
private class MockUIManager: RCTUIManager {}

private class MockDatadogCore: DatadogCoreProtocol {
func mostRecentModifiedFileAt(before: Date) throws -> Date? {
return nil
}

func scope<T>(for featureType: T.Type) -> any DatadogInternal.FeatureScope where T : DatadogInternal.DatadogFeature {
return NOPFeatureScope()
}
Expand Down
Loading