From bc806612ec6d8e288562a4fb06fa02d2211c9b27 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Wed, 24 Nov 2021 10:57:48 +0100 Subject: [PATCH 1/2] RUMM-1758 Fix Xcode 12.x compilation issue in 'Example' target --- .../DebugRUMSessionViewController.swift | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Datadog/Example/Debugging/DebugRUMSessionViewController.swift b/Datadog/Example/Debugging/DebugRUMSessionViewController.swift index dbc9b8b300..c44628383e 100644 --- a/Datadog/Example/Debugging/DebugRUMSessionViewController.swift +++ b/Datadog/Example/Debugging/DebugRUMSessionViewController.swift @@ -44,23 +44,23 @@ private class DebugRUMSessionViewModel: ObservableObject { return } - let viewKey = viewKey + let key = viewKey sessionItems.append( SessionItem( - label: viewKey, + label: key, type: .view, isPending: true, stopAction: { [weak self] in - self?.modifySessionItem(type: .view, label: viewKey) { mutableSessionItem in + self?.modifySessionItem(type: .view, label: key) { mutableSessionItem in mutableSessionItem.isPending = false mutableSessionItem.stopAction = nil - Global.rum.stopView(key: viewKey) + Global.rum.stopView(key: key) } } ) ) - Global.rum.startView(key: viewKey) + Global.rum.startView(key: key) self.viewKey = "" } @@ -95,23 +95,23 @@ private class DebugRUMSessionViewModel: ObservableObject { return } - let resourceKey = self.resourceKey + let key = self.resourceKey sessionItems.append( SessionItem( - label: resourceKey, + label: key, type: .resource, isPending: true, stopAction: { [weak self] in - self?.modifySessionItem(type: .resource, label: resourceKey) { mutableSessionItem in + self?.modifySessionItem(type: .resource, label: key) { mutableSessionItem in mutableSessionItem.isPending = false mutableSessionItem.stopAction = nil - Global.rum.stopResourceLoading(resourceKey: resourceKey, statusCode: nil, kind: .other) + Global.rum.stopResourceLoading(resourceKey: key, statusCode: nil, kind: .other) } } ) ) - Global.rum.startResourceLoading(resourceKey: resourceKey, url: mockURL()) + Global.rum.startResourceLoading(resourceKey: key, url: mockURL()) self.resourceKey = "" } @@ -171,7 +171,7 @@ internal struct DebugRUMSessionView: View { .listRowInsets(EdgeInsets()) .padding(4) } - .listStyle(.plain) + .listStyle(PlainListStyle()) } .buttonStyle(DatadogButtonStyle()) .padding() From 785d09bae3822a10426f112eaa8b889461c3355c Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Wed, 24 Nov 2021 10:58:16 +0100 Subject: [PATCH 2/2] RUMM-1758 Resolve Xcode 13.1 upgrade warnings --- Datadog/Datadog.xcodeproj/project.pbxproj | 2 +- .../Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme | 2 +- .../xcshareddata/xcschemes/DatadogBenchmarkTests.xcscheme | 2 +- .../xcshareddata/xcschemes/DatadogCrashReporting.xcscheme | 2 +- .../xcshareddata/xcschemes/DatadogIntegrationTests.xcscheme | 2 +- .../xcshareddata/xcschemes/DatadogObjc.xcscheme | 2 +- Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2E.xcscheme | 2 +- .../xcshareddata/xcschemes/E2EInstrumentationTests.xcscheme | 2 +- .../Datadog.xcodeproj/xcshareddata/xcschemes/E2ETests.xcscheme | 2 +- .../Datadog.xcodeproj/xcshareddata/xcschemes/Example.xcscheme | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj index a92f2bb363..7e7a335671 100644 --- a/Datadog/Datadog.xcodeproj/project.pbxproj +++ b/Datadog/Datadog.xcodeproj/project.pbxproj @@ -3570,7 +3570,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1310; ORGANIZATIONNAME = Datadog; TargetAttributes = { 61133B81242393DE00786299 = { diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme index 50cc60bb65..4d7540a66d 100644 --- a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme +++ b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog.xcscheme @@ -1,6 +1,6 @@