Skip to content

Commit

Permalink
Merge branch 'main' into purvi/use-batch-spanprocessor
Browse files Browse the repository at this point in the history
  • Loading branch information
pkanal authored Sep 24, 2024
2 parents bea092c + 4f3acb6 commit 2204ab8
Show file tree
Hide file tree
Showing 27 changed files with 1,336 additions and 330 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
device: "iPhone 15"
- checkout
- run: xcodebuild -version
- run: xcodebuild test -scheme honeycomb-opentelemetry-swift -sdk iphonesimulator17.5 -destination 'OS=17.5,name=iPhone 15'
- run: xcodebuild test -scheme HoneycombTests -sdk iphonesimulator17.5 -destination 'OS=17.5,name=iPhone 15'

workflows:
lint:
Expand Down
54 changes: 54 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/HoneycombTests.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "HoneycombTests"
BuildableName = "HoneycombTests"
BlueprintName = "HoneycombTests"
ReferencedContainer = "container:">
</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">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
9 changes: 1 addition & 8 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**Required:**

- Xcode (from the [Mac App Store](https://apps.apple.com/us/app/xcode/id497799835))
- Xcode 16.0 or later (from the [Mac App Store](https://apps.apple.com/us/app/xcode/id497799835))

Development and unit tests are done within Xcode. However, there is also a smoke-test, which must be run using the included Makefile.

Expand All @@ -28,13 +28,6 @@ To install the Xcode Command Line Tools, first install and run Xcode. Then run:
xcode-select --install
```

If you are on Xcode 16.0 or later, `swift-format` is pre-installed. But if you are on an earlier
version, you can install it manually with brew.

```sh
brew install swift-format
```

Install `bats-core` and `jq` for local testing:

```sh
Expand Down
Loading

0 comments on commit 2204ab8

Please sign in to comment.