Skip to content

Commit cdddd4e

Browse files
authored
Enable MemberImportVisibility (#320)
Adopting this feature flag will be required in the future. See swiftlang/swift-build#405 * Use str.joined(separator:) over joined(by:), which was implicitly imported from Algorithms
1 parent 63cb10f commit cdddd4e

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

Package.swift

+16-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
import PackageDescription
44

5+
let swiftSettings = [
6+
SwiftSetting.enableUpcomingFeature("MemberImportVisibility"),
7+
]
8+
59
let package = Package(
610
name: "swiftly",
711
platforms: [
@@ -38,7 +42,8 @@ let package = Package(
3842
.target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
3943
.target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
4044
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
41-
]
45+
],
46+
swiftSettings: swiftSettings
4247
),
4348
.executableTarget(
4449
name: "TestSwiftly",
@@ -47,7 +52,8 @@ let package = Package(
4752
.target(name: "SwiftlyCore"),
4853
.target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
4954
.target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
50-
]
55+
],
56+
swiftSettings: swiftSettings
5157
),
5258
.target(
5359
name: "SwiftlyCore",
@@ -59,12 +65,14 @@ let package = Package(
5965
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
6066
.product(name: "OpenAPIAsyncHTTPClient", package: "swift-openapi-async-http-client"),
6167
],
68+
swiftSettings: swiftSettings
6269
),
6370
.target(
6471
name: "SwiftlyDownloadAPI",
6572
dependencies: [
6673
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
6774
],
75+
swiftSettings: swiftSettings,
6876
plugins: [
6977
.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
7078
]
@@ -74,6 +82,7 @@ let package = Package(
7482
dependencies: [
7583
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
7684
],
85+
swiftSettings: swiftSettings,
7786
plugins: [
7887
.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
7988
]
@@ -115,6 +124,7 @@ let package = Package(
115124
"SwiftlyCore",
116125
"CLibArchive",
117126
],
127+
swiftSettings: swiftSettings,
118128
linkerSettings: [
119129
.linkedLibrary("z"),
120130
]
@@ -123,7 +133,8 @@ let package = Package(
123133
name: "MacOSPlatform",
124134
dependencies: [
125135
"SwiftlyCore",
126-
]
136+
],
137+
swiftSettings: swiftSettings
127138
),
128139
.systemLibrary(
129140
name: "CLibArchive",
@@ -137,7 +148,8 @@ let package = Package(
137148
dependencies: ["Swiftly"],
138149
resources: [
139150
.embedInCode("mock-signing-key-private.pgp"),
140-
]
151+
],
152+
swiftSettings: swiftSettings
141153
),
142154
]
143155
)

Sources/Swiftly/Proxy.swift

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import ArgumentParser
12
import Foundation
23
import SwiftlyCore
34

Sources/Swiftly/SelfUpdate.swift

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ArgumentParser
22
import Foundation
33
import SwiftlyCore
4+
import SwiftlyWebsiteAPI
45
@preconcurrency import TSCBasic
56
import TSCUtility
67

Sources/SwiftlyCore/Platform.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ extension Platform {
185185
let swiftlyBinDir = self.swiftlyBinDir(ctx)
186186
pathComponents.removeAll(where: { $0 == swiftlyBinDir.path })
187187

188-
newEnv["PATH"] = String(pathComponents.joined(by: ":"))
188+
newEnv["PATH"] = String(pathComponents.joined(separator: ":"))
189189

190190
return newEnv
191191
}

0 commit comments

Comments
 (0)