Skip to content

Commit 7ccef0d

Browse files
authored
Allow for more flexibility in what path SWIFTCI_USE_LOCAL_DEPS means (#5048)
1 parent 7f38264 commit 7ccef0d

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

Package.swift

+18-10
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,33 @@ let interfaceBuildSettings: [CSetting] = [
101101
let swiftBuildSettings: [SwiftSetting] = [
102102
.define("DEPLOYMENT_RUNTIME_SWIFT"),
103103
.define("SWIFT_CORELIBS_FOUNDATION_HAS_THREADS"),
104-
.swiftLanguageVersion(.v6),
104+
.swiftLanguageMode(.v6),
105105
.unsafeFlags([
106106
"-Xfrontend",
107107
"-require-explicit-sendable",
108108
])
109109
]
110110

111-
var dependencies: [Package.Dependency] {
112-
if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] != nil {
111+
var dependencies: [Package.Dependency] = []
112+
113+
if let useLocalDepsEnv = Context.environment["SWIFTCI_USE_LOCAL_DEPS"] {
114+
let root: String
115+
if useLocalDepsEnv == "1" {
116+
root = ".."
117+
} else {
118+
root = useLocalDepsEnv
119+
}
120+
dependencies +=
113121
[
114122
.package(
115123
name: "swift-foundation-icu",
116-
path: "../swift-foundation-icu"),
124+
path: "\(root)/swift-foundation-icu"),
117125
.package(
118126
name: "swift-foundation",
119-
path: "../swift-foundation")
127+
path: "\(root)/swift-foundation")
120128
]
121-
} else {
129+
} else {
130+
dependencies +=
122131
[
123132
.package(
124133
url: "https://github.com/apple/swift-foundation-icu",
@@ -127,7 +136,6 @@ var dependencies: [Package.Dependency] {
127136
url: "https://github.com/apple/swift-foundation",
128137
branch: "main")
129138
]
130-
}
131139
}
132140

133141
let package = Package(
@@ -244,7 +252,7 @@ let package = Package(
244252
"CMakeLists.txt"
245253
],
246254
swiftSettings: [
247-
.swiftLanguageVersion(.v6)
255+
.swiftLanguageMode(.v6)
248256
]
249257
),
250258
.executableTarget(
@@ -255,7 +263,7 @@ let package = Package(
255263
"FoundationNetworking"
256264
],
257265
swiftSettings: [
258-
.swiftLanguageVersion(.v6)
266+
.swiftLanguageMode(.v6)
259267
]
260268
),
261269
.target(
@@ -283,7 +291,7 @@ let package = Package(
283291
],
284292
swiftSettings: [
285293
.define("NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT"),
286-
.swiftLanguageVersion(.v6)
294+
.swiftLanguageMode(.v6)
287295
]
288296
),
289297
]

0 commit comments

Comments
 (0)