Skip to content

Commit 957cd73

Browse files
Add Swift 6.2 manifest and trait opt-out
1 parent 2eac5f5 commit 957cd73

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ unittest:
1111
echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID=<id>'."; \
1212
exit 2; \
1313
}
14+
ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1)
15+
TRACING_ARGS :=
16+
else
17+
TRACING_ARGS := --traits Tracing
18+
endif
1419
env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \
15-
--traits Tracing \
20+
$(TRACING_ARGS) \
1621
--disable-sandbox \
1722
js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc
1823

Package.swift

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ import PackageDescription
77
let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
88
let useLegacyResourceBundling =
99
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
10-
11-
let tracingTrait = Trait(
12-
name: "Tracing",
13-
description: "Enable opt-in Swift <-> JavaScript bridge tracing hooks.",
14-
enabledTraits: []
15-
)
10+
let enableTracingByEnv = Context.environment["JAVASCRIPTKIT_ENABLE_TRACING"].flatMap(Bool.init) ?? false
1611

1712
let testingLinkerFlags: [LinkerSetting] = [
1813
.unsafeFlags([
@@ -42,7 +37,6 @@ let package = Package(
4237
.plugin(name: "BridgeJS", targets: ["BridgeJS"]),
4338
.plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]),
4439
],
45-
traits: [tracingTrait],
4640
dependencies: [
4741
.package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0")
4842
],
@@ -59,6 +53,7 @@ let package = Package(
5953
swiftSettings: [
6054
.enableExperimentalFeature("Extern")
6155
]
56+
+ (enableTracingByEnv ? [.define("Tracing")] : [])
6257
+ (shouldBuildForEmbedded
6358
? [
6459
.enableExperimentalFeature("Embedded"),
@@ -79,7 +74,7 @@ let package = Package(
7974
dependencies: ["JavaScriptKit"],
8075
swiftSettings: [
8176
.enableExperimentalFeature("Extern")
82-
],
77+
] + (enableTracingByEnv ? [.define("Tracing")] : []),
8378
linkerSettings: testingLinkerFlags
8479
),
8580

0 commit comments

Comments
 (0)