diff --git a/Package.swift b/Package.swift index acb0a783..9531d9a0 100644 --- a/Package.swift +++ b/Package.swift @@ -2,6 +2,10 @@ import PackageDescription +let swiftSettings = [ + SwiftSetting.enableUpcomingFeature("MemberImportVisibility"), +] + let package = Package( name: "swiftly", platforms: [ @@ -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", @@ -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", @@ -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"), ] @@ -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"), ] @@ -115,6 +124,7 @@ let package = Package( "SwiftlyCore", "CLibArchive", ], + swiftSettings: swiftSettings, linkerSettings: [ .linkedLibrary("z"), ] @@ -123,7 +133,8 @@ let package = Package( name: "MacOSPlatform", dependencies: [ "SwiftlyCore", - ] + ], + swiftSettings: swiftSettings ), .systemLibrary( name: "CLibArchive", @@ -137,7 +148,8 @@ let package = Package( dependencies: ["Swiftly"], resources: [ .embedInCode("mock-signing-key-private.pgp"), - ] + ], + swiftSettings: swiftSettings ), ] ) diff --git a/Sources/Swiftly/Proxy.swift b/Sources/Swiftly/Proxy.swift index 37b710c6..17b733c2 100644 --- a/Sources/Swiftly/Proxy.swift +++ b/Sources/Swiftly/Proxy.swift @@ -1,3 +1,4 @@ +import ArgumentParser import Foundation import SwiftlyCore diff --git a/Sources/Swiftly/SelfUpdate.swift b/Sources/Swiftly/SelfUpdate.swift index e0d8d7c2..9eb76b1f 100644 --- a/Sources/Swiftly/SelfUpdate.swift +++ b/Sources/Swiftly/SelfUpdate.swift @@ -1,6 +1,7 @@ import ArgumentParser import Foundation import SwiftlyCore +import SwiftlyWebsiteAPI @preconcurrency import TSCBasic import TSCUtility diff --git a/Sources/SwiftlyCore/Platform.swift b/Sources/SwiftlyCore/Platform.swift index 698fb2c6..4d6db213 100644 --- a/Sources/SwiftlyCore/Platform.swift +++ b/Sources/SwiftlyCore/Platform.swift @@ -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 }