Skip to content

Enable MemberImportVisibility #320

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
merged 2 commits into from
Apr 14, 2025
Merged

Enable MemberImportVisibility #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78280ba
Enable MemberImportVisibility
plemarquand Apr 12, 2025
3834b81
Use str.joined(separator:) over joined(by:), which was implicitly imp…
plemarquand Apr 14, 2025
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
20 changes: 16 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import PackageDescription

let swiftSettings = [
SwiftSetting.enableUpcomingFeature("MemberImportVisibility"),
]

let package = Package(
name: "swiftly",
platforms: [
Expand Down Expand Up @@ -38,7 +42,8 @@ let package = Package(
.target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
.target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]
],
swiftSettings: swiftSettings
),
.executableTarget(
name: "TestSwiftly",
Expand All @@ -47,7 +52,8 @@ let package = Package(
.target(name: "SwiftlyCore"),
.target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
.target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
]
],
swiftSettings: swiftSettings
),
.target(
name: "SwiftlyCore",
Expand All @@ -59,12 +65,14 @@ let package = Package(
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
.product(name: "OpenAPIAsyncHTTPClient", package: "swift-openapi-async-http-client"),
],
swiftSettings: swiftSettings
),
.target(
name: "SwiftlyDownloadAPI",
dependencies: [
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
],
swiftSettings: swiftSettings,
plugins: [
.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
]
Expand All @@ -74,6 +82,7 @@ let package = Package(
dependencies: [
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
],
swiftSettings: swiftSettings,
plugins: [
.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
]
Expand Down Expand Up @@ -115,6 +124,7 @@ let package = Package(
"SwiftlyCore",
"CLibArchive",
],
swiftSettings: swiftSettings,
linkerSettings: [
.linkedLibrary("z"),
]
Expand All @@ -123,7 +133,8 @@ let package = Package(
name: "MacOSPlatform",
dependencies: [
"SwiftlyCore",
]
],
swiftSettings: swiftSettings
),
.systemLibrary(
name: "CLibArchive",
Expand All @@ -137,7 +148,8 @@ let package = Package(
dependencies: ["Swiftly"],
resources: [
.embedInCode("mock-signing-key-private.pgp"),
]
],
swiftSettings: swiftSettings
),
]
)
1 change: 1 addition & 0 deletions Sources/Swiftly/Proxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ArgumentParser
import Foundation
import SwiftlyCore

Expand Down
1 change: 1 addition & 0 deletions Sources/Swiftly/SelfUpdate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ArgumentParser
import Foundation
import SwiftlyCore
import SwiftlyWebsiteAPI
@preconcurrency import TSCBasic
import TSCUtility

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftlyCore/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ extension Platform {
let swiftlyBinDir = self.swiftlyBinDir(ctx)
pathComponents.removeAll(where: { $0 == swiftlyBinDir.path })

newEnv["PATH"] = String(pathComponents.joined(by: ":"))
newEnv["PATH"] = String(pathComponents.joined(separator: ":"))

return newEnv
}
Expand Down