Skip to content

Commit b456f19

Browse files
chore: relax swift-syntax dep to 600..<700 for Swarm co-residency
1 parent 0590bfb commit b456f19

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let package = Package(
3333
.package(url: "https://github.com/open-telemetry/opentelemetry-swift-core.git", from: "2.3.0"),
3434
.package(url: "https://github.com/open-telemetry/opentelemetry-swift.git", from: "2.3.0"),
3535
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
36-
.package(url: "https://github.com/swiftlang/swift-syntax.git", from: "602.0.0")
36+
.package(url: "https://github.com/swiftlang/swift-syntax.git", "600.0.0"..<"700.0.0")
3737
],
3838
targets: [
3939
// MARK: - Zig Core (C ABI bridge)

Scripts/build-libtera-xcframework.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ echo "==> Creating universal binary with lipo..."
5656
lipo -create \
5757
"$BUILD_DIR/aarch64-macos/lib/libterra.a" \
5858
"$BUILD_DIR/x86_64-macos/lib/libterra.a" \
59-
-output "$BUILD_DIR/macos-universal/libterra.a"
59+
-output "$BUILD_DIR/macos-universal/libtera.a"
6060

6161
# Verify the fat binary
6262
echo "==> Verifying universal binary:"
63-
lipo -info "$BUILD_DIR/macos-universal/libterra.a"
63+
lipo -info "$BUILD_DIR/macos-universal/libtera.a"
6464

6565
# ── Package as xcframework ───────────────────────────────────────────────
6666
echo "==> Creating xcframework at $XCFRAMEWORK_DIR..."
6767
rm -rf "$XCFRAMEWORK_DIR"
6868
mkdir -p "$VENDOR_DIR"
6969

7070
xcodebuild -create-xcframework \
71-
-library "$BUILD_DIR/macos-universal/libterra.a" \
71+
-library "$BUILD_DIR/macos-universal/libtera.a" \
7272
-headers "$ZIG_CORE/include" \
7373
-output "$XCFRAMEWORK_DIR"
7474

Tests/TerraTests/TerraProtocolSeamsTests.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import Testing
66
struct TerraProtocolSeamsTests {
77
@Test("Injected telemetry engine captures deterministic instrumentation")
88
func injectedTelemetryEngineCapturesDeterministicInstrumentation() async throws {
9+
let support = TerraTestSupport()
10+
_ = support
911
let log = SeamLog()
1012
let engine = MockEngine(log: log)
1113

@@ -48,6 +50,8 @@ struct TerraProtocolSeamsTests {
4850

4951
@Test("Injected engine records thrown errors without real transport")
5052
func injectedEngineRecordsThrownErrors() async {
53+
let support = TerraTestSupport()
54+
_ = support
5155
enum ExpectedError: Error { case boom }
5256

5357
let log = SeamLog()

Vendor/libtera.xcframework/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>libterra.a</string>
9+
<string>libtera.a</string>
1010
<key>HeadersPath</key>
1111
<string>Headers</string>
1212
<key>LibraryIdentifier</key>
1313
<string>macos-arm64_x86_64</string>
1414
<key>LibraryPath</key>
15-
<string>libterra.a</string>
15+
<string>libtera.a</string>
1616
<key>SupportedArchitectures</key>
1717
<array>
1818
<string>arm64</string>

Vendor/libtera.xcframework/macos-arm64_x86_64/libterra.a renamed to Vendor/libtera.xcframework/macos-arm64_x86_64/libtera.a

File renamed without changes.

0 commit comments

Comments
 (0)