Skip to content

flip Package.swift file versioning #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 1 commit into from
Apr 9, 2026
Merged

flip Package.swift file versioning #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:6.1
// swift-tools-version:6.2

import CompilerPluginSupport
import PackageDescription
Expand All @@ -7,6 +7,13 @@ import PackageDescription
let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
let useLegacyResourceBundling =
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
let enableTracingByEnv = Context.environment["JAVASCRIPTKIT_ENABLE_TRACING"].flatMap(Bool.init) ?? false

let tracingTrait = Trait(
name: "Tracing",
description: "Enable opt-in Swift <-> JavaScript bridge tracing hooks.",
enabledTraits: []
)

let testingLinkerFlags: [LinkerSetting] = [
.unsafeFlags(
Expand Down Expand Up @@ -39,6 +46,7 @@ let package = Package(
.plugin(name: "BridgeJS", targets: ["BridgeJS"]),
.plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]),
],
traits: [tracingTrait],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0")
],
Expand All @@ -53,8 +61,10 @@ let package = Package(
.unsafeFlags(["-fdeclspec"])
] : nil,
swiftSettings: [
.enableExperimentalFeature("Extern")
.enableExperimentalFeature("Extern"),
.define("Tracing", .when(traits: ["Tracing"])),
]
+ (enableTracingByEnv ? [.define("Tracing")] : [])
+ (shouldBuildForEmbedded
? [
.enableExperimentalFeature("Embedded"),
Expand All @@ -74,8 +84,9 @@ let package = Package(
name: "JavaScriptKitTests",
dependencies: ["JavaScriptKit"],
swiftSettings: [
.enableExperimentalFeature("Extern")
],
.enableExperimentalFeature("Extern"),
.define("Tracing", .when(traits: ["Tracing"])),
] + (enableTracingByEnv ? [.define("Tracing")] : []),
linkerSettings: testingLinkerFlags
),

Expand Down
19 changes: 4 additions & 15 deletions Package@swift-6.2.swift → Package@swift-6.1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:6.2
// swift-tools-version:6.1

import CompilerPluginSupport
import PackageDescription
Expand All @@ -7,13 +7,6 @@ import PackageDescription
let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
let useLegacyResourceBundling =
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
let enableTracingByEnv = Context.environment["JAVASCRIPTKIT_ENABLE_TRACING"].flatMap(Bool.init) ?? false

let tracingTrait = Trait(
name: "Tracing",
description: "Enable opt-in Swift <-> JavaScript bridge tracing hooks.",
enabledTraits: []
)

let testingLinkerFlags: [LinkerSetting] = [
.unsafeFlags(
Expand Down Expand Up @@ -46,7 +39,6 @@ let package = Package(
.plugin(name: "BridgeJS", targets: ["BridgeJS"]),
.plugin(name: "BridgeJSCommandPlugin", targets: ["BridgeJSCommandPlugin"]),
],
traits: [tracingTrait],
dependencies: [
.package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0")
],
Expand All @@ -61,10 +53,8 @@ let package = Package(
.unsafeFlags(["-fdeclspec"])
] : nil,
swiftSettings: [
.enableExperimentalFeature("Extern"),
.define("Tracing", .when(traits: ["Tracing"])),
.enableExperimentalFeature("Extern")
]
+ (enableTracingByEnv ? [.define("Tracing")] : [])
+ (shouldBuildForEmbedded
? [
.enableExperimentalFeature("Embedded"),
Expand All @@ -84,9 +74,8 @@ let package = Package(
name: "JavaScriptKitTests",
dependencies: ["JavaScriptKit"],
swiftSettings: [
.enableExperimentalFeature("Extern"),
.define("Tracing", .when(traits: ["Tracing"])),
] + (enableTracingByEnv ? [.define("Tracing")] : []),
.enableExperimentalFeature("Extern")
],
linkerSettings: testingLinkerFlags
),

Expand Down
Loading