Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion Sources/Workspace/InitPackage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ public final class InitPackage {
/// Note: This should only contain Apple platforms right now.
public var platforms: [SupportedPlatform]

/// The swiftLanguageModes to include
public var swiftLanguageModes: [SwiftLanguageVersion]

public init(
packageType: PackageType,
supportedTestingLibraries: Set<TestingLibrary>,
platforms: [SupportedPlatform] = []
platforms: [SupportedPlatform] = [],
swiftLanguageModes: [SwiftLanguageVersion] = [SwiftLanguageVersion.v6]
) {
self.packageType = packageType
self.supportedTestingLibraries = supportedTestingLibraries
self.platforms = platforms
self.swiftLanguageModes = swiftLanguageModes
}
}

Expand Down Expand Up @@ -432,6 +437,12 @@ public final class InitPackage {
pkgParams.append(param)
}

if (!options.swiftLanguageModes.isEmpty) {
pkgParams.append("""
swiftLanguageModes: [\(options.swiftLanguageModes.map { ".v\($0)" }.joined(separator: ", "))]
""")
}

stream.send("\(pkgParams.joined(separator: ",\n"))\n)\n")
}

Expand Down
5 changes: 3 additions & 2 deletions Sources/_InternalTestSupport/misc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -666,11 +666,12 @@ extension InitPackage {
packageType: PackageType,
supportedTestingLibraries: Set<TestingLibrary> = [.swiftTesting],
destinationPath: AbsolutePath,
fileSystem: FileSystem
fileSystem: FileSystem,
swiftLanguageModes: [SwiftLanguageVersion] = []
) throws {
try self.init(
name: name,
options: InitPackageOptions(packageType: packageType, supportedTestingLibraries: supportedTestingLibraries),
options: InitPackageOptions(packageType: packageType, supportedTestingLibraries: supportedTestingLibraries, swiftLanguageModes: swiftLanguageModes),
destinationPath: destinationPath,
installedSwiftPMConfiguration: .default,
fileSystem: fileSystem
Expand Down
25 changes: 25 additions & 0 deletions Tests/WorkspaceTests/InitTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,31 @@ final class InitTests: XCTestCase {
}
}

func testInitPackageIncludesSwiftLanguageMode() throws {
try testWithTemporaryDirectory { tmpPath in
let fs = localFileSystem
let path = tmpPath.appending("testInitPackageIncludesSwiftLanguageMode")
let name = path.basename
try fs.createDirectory(path)

// Create a library package
let initPackage = try InitPackage(
name: name,
packageType: .library,
supportedTestingLibraries: [],
destinationPath: path,
installedSwiftPMConfiguration: .default,
fileSystem: localFileSystem
)
try initPackage.writePackageStructure()

// Verify the manifest includes Swift language mode
let manifest = path.appending("Package.swift")
let manifestContents: String = try localFileSystem.readFileContents(manifest)
XCTAssertMatch(manifestContents, .contains("swiftLanguageModes: [.v6]"))
}
}

private func packageWithNameOnly(named name: String) -> String {
return """
let package = Package(
Expand Down