@@ -101,24 +101,33 @@ let interfaceBuildSettings: [CSetting] = [
101
101
let swiftBuildSettings : [ SwiftSetting ] = [
102
102
. define( " DEPLOYMENT_RUNTIME_SWIFT " ) ,
103
103
. define( " SWIFT_CORELIBS_FOUNDATION_HAS_THREADS " ) ,
104
- . swiftLanguageVersion ( . v6) ,
104
+ . swiftLanguageMode ( . v6) ,
105
105
. unsafeFlags( [
106
106
" -Xfrontend " ,
107
107
" -require-explicit-sendable " ,
108
108
] )
109
109
]
110
110
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 +=
113
121
[
114
122
. package (
115
123
name: " swift-foundation-icu " ,
116
- path: " .. /swift-foundation-icu" ) ,
124
+ path: " \( root ) /swift-foundation-icu " ) ,
117
125
. package (
118
126
name: " swift-foundation " ,
119
- path: " .. /swift-foundation" )
127
+ path: " \( root ) /swift-foundation " )
120
128
]
121
- } else {
129
+ } else {
130
+ dependencies +=
122
131
[
123
132
. package (
124
133
url: " https://github.com/apple/swift-foundation-icu " ,
@@ -127,7 +136,6 @@ var dependencies: [Package.Dependency] {
127
136
url: " https://github.com/apple/swift-foundation " ,
128
137
branch: " main " )
129
138
]
130
- }
131
139
}
132
140
133
141
let package = Package (
@@ -244,7 +252,7 @@ let package = Package(
244
252
" CMakeLists.txt "
245
253
] ,
246
254
swiftSettings: [
247
- . swiftLanguageVersion ( . v6)
255
+ . swiftLanguageMode ( . v6)
248
256
]
249
257
) ,
250
258
. executableTarget(
@@ -255,7 +263,7 @@ let package = Package(
255
263
" FoundationNetworking "
256
264
] ,
257
265
swiftSettings: [
258
- . swiftLanguageVersion ( . v6)
266
+ . swiftLanguageMode ( . v6)
259
267
]
260
268
) ,
261
269
. target(
@@ -283,7 +291,7 @@ let package = Package(
283
291
] ,
284
292
swiftSettings: [
285
293
. define( " NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT " ) ,
286
- . swiftLanguageVersion ( . v6)
294
+ . swiftLanguageMode ( . v6)
287
295
]
288
296
) ,
289
297
]
0 commit comments