Merge pull request #672 from DataDog/ncreated/RUMM-1758-fix-Example-a…

…pp-compilation-in-Xcode-12 RUMM-1758 Fix Example app compilation in Xcode 12
DataDog · Nov 24, 2021 · c5983a4 · c5983a4
2 parents 3b88005 + 785d09b
commit c5983a4
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogBenchmarkTests.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogBenchmarkTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogCrashReporting.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogCrashReporting.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogIntegrationTests.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogIntegrationTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogObjc.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogObjc.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2E.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2E.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2EInstrumentationTests.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2EInstrumentationTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2ETests.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/E2ETests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git 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()