Skip to content

Commit

Permalink
Merge branch 'develop' into maxep/update-changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
maxep authored Mar 29, 2022
2 parents c09554f + 1c3e2b0 commit 27e359d
Show file tree
Hide file tree
Showing 118 changed files with 5,962 additions and 1,088 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* [FEATURE] Web-view tracking. See [#729][]
* [FEATURE] Integration with CI Visibility Tests. See[#761][]
* [FEATURE] Add tvOS Support. See [#793][]
* [BUGFIX] Strip query parameters from span resource. See [#728][]
* [BUGFIX] Stop reporting pre-warmed application launch time. See [#789][]

Expand Down Expand Up @@ -328,6 +329,7 @@
[#729]: https://github.com/DataDog/dd-sdk-ios/issues/729
[#761]: https://github.com/DataDog/dd-sdk-ios/issues/761
[#789]: https://github.com/DataDog/dd-sdk-ios/issues/789
[#793]: https://github.com/DataDog/dd-sdk-ios/issues/793
[@00FA9A]: https://github.com/00FA9A
[@Britton-Earnin]: https://github.com/Britton-Earnin
[@Hengyu]: https://github.com/Hengyu
Expand Down
2,242 changes: 2,027 additions & 215 deletions Datadog/Datadog.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133B81242393DE00786299"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog"
BlueprintName = "Datadog iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -35,7 +35,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133B8A242393DE00786299"
BuildableName = "DatadogTests.xctest"
BlueprintName = "DatadogTests"
BlueprintName = "DatadogTests iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down Expand Up @@ -127,14 +127,14 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133B81242393DE00786299"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog"
BlueprintName = "Datadog iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133BEF242397DA00786299"
BuildableName = "DatadogObjc.framework"
BlueprintName = "DatadogObjc"
BlueprintName = "DatadogObjc iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
Expand All @@ -146,7 +146,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133B8A242393DE00786299"
BuildableName = "DatadogTests.xctest"
BlueprintName = "DatadogTests"
BlueprintName = "DatadogTests iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</TestableReference>
Expand Down Expand Up @@ -174,7 +174,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61133B81242393DE00786299"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog"
BlueprintName = "Datadog iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
180 changes: 180 additions & 0 deletions Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog tvOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D2CB6E0A27C50EAE00A62B57"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog tvOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO"
enableThreadSanitizer = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<CommandLineArguments>
<CommandLineArgument
argument = "IS_RUNNING_UNIT_TESTS"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "DD_TEST_RUNNER"
value = "$(DD_TEST_RUNNER)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DATADOG_CLIENT_TOKEN"
value = "$(DD_SDK_SWIFT_TESTING_CLIENT_TOKEN)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_ENV"
value = "$(DD_SDK_SWIFT_TESTING_ENV)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_SERVICE"
value = "$(DD_SDK_SWIFT_TESTING_SERVICE)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_DISABLE_SDKIOS_INTEGRATION"
value = "1"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_DISABLE_HEADERS_INJECTION"
value = "1"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_DISABLE_NETWORK_INSTRUMENTATION"
value = "$(DD_DISABLE_NETWORK_INSTRUMENTATION)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "SRCROOT"
value = "$(SRCROOT)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "BITRISE_SOURCE_DIR"
value = "$(BITRISE_SOURCE_DIR)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "BITRISE_TRIGGERED_WORKFLOW_ID"
value = "$(BITRISE_TRIGGERED_WORKFLOW_ID)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "BITRISE_BUILD_SLUG"
value = "$(BITRISE_BUILD_SLUG)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "BITRISE_BUILD_NUMBER"
value = "$(BITRISE_BUILD_NUMBER)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "BITRISE_BUILD_URL"
value = "$(BITRISE_BUILD_URL)"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_ENABLE_STDOUT_INSTRUMENTATION"
value = "1"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "DD_ENABLE_STDERR_INSTRUMENTATION"
value = "1"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D2CB6E0A27C50EAE00A62B57"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog tvOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D2CB6F9227C5217A00A62B57"
BuildableName = "DatadogObjc.framework"
BlueprintName = "DatadogObjc tvOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D2CB6ED327C520D400A62B57"
BuildableName = "DatadogTests.xctest"
BlueprintName = "DatadogTests tvOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D2CB6E0A27C50EAE00A62B57"
BuildableName = "Datadog.framework"
BlueprintName = "Datadog tvOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61B7885325C180CB002675B5"
BuildableName = "DatadogCrashReporting.framework"
BlueprintName = "DatadogCrashReporting"
BlueprintName = "DatadogCrashReporting iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -35,7 +35,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61B7885B25C180CB002675B5"
BuildableName = "DatadogCrashReportingTests.xctest"
BlueprintName = "DatadogCrashReportingTests"
BlueprintName = "DatadogCrashReportingTests iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down Expand Up @@ -182,7 +182,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61B7885325C180CB002675B5"
BuildableName = "DatadogCrashReporting.framework"
BlueprintName = "DatadogCrashReporting"
BlueprintName = "DatadogCrashReporting iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
Expand All @@ -193,7 +193,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61B7885B25C180CB002675B5"
BuildableName = "DatadogCrashReportingTests.xctest"
BlueprintName = "DatadogCrashReportingTests"
BlueprintName = "DatadogCrashReportingTests iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</TestableReference>
Expand Down Expand Up @@ -221,7 +221,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "61B7885325C180CB002675B5"
BuildableName = "DatadogCrashReporting.framework"
BlueprintName = "DatadogCrashReporting"
BlueprintName = "DatadogCrashReporting iOS"
ReferencedContainer = "container:Datadog.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Loading

0 comments on commit 27e359d

Please sign in to comment.