-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into ncreated/fix-dogfooding-branch-for-tvOS
- Loading branch information
Showing
220 changed files
with
10,779 additions
and
4,537 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| CHANGELOG.md merge=union |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 180 additions & 0 deletions
180
Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/Datadog tvOS.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.