File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -290,7 +290,12 @@ public final class InitPackage {
290
290
: sources. appending ( component: " \( pkgname) " )
291
291
try makeDirectories ( moduleDir)
292
292
293
- let sourceFileName = " \( typeName) .swift "
293
+ let sourceFileName : String
294
+ if packageType == . executable {
295
+ sourceFileName = " main.swift "
296
+ } else {
297
+ sourceFileName = " \( typeName) .swift "
298
+ }
294
299
let sourceFile = try AbsolutePath ( validating: sourceFileName, relativeTo: moduleDir)
295
300
296
301
let content : String
Original file line number Diff line number Diff line change @@ -718,7 +718,7 @@ final class PackageToolTests: CommandsTestCase {
718
718
XCTAssertMatch ( contents, . prefix( " // swift-tools-version: \( version < . v5_4 ? " " : " " ) \( versionSpecifier) \n " ) )
719
719
720
720
XCTAssertFileExists ( manifest)
721
- XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " Foo .swift" ] )
721
+ XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " main .swift" ] )
722
722
}
723
723
}
724
724
@@ -749,7 +749,7 @@ final class PackageToolTests: CommandsTestCase {
749
749
XCTAssertMatch ( contents, . prefix( " // swift-tools-version: \( version < . v5_4 ? " " : " " ) \( versionSpecifier) \n " ) )
750
750
751
751
XCTAssertFileExists ( manifest)
752
- XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " CustomName .swift" ] )
752
+ XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " main .swift" ] )
753
753
}
754
754
}
755
755
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ class InitTests: XCTestCase {
85
85
let versionSpecifier = " \( version. major) . \( version. minor) "
86
86
XCTAssertMatch ( manifestContents, . prefix( " // swift-tools-version: \( version < . v5_4 ? " " : " " ) \( versionSpecifier) \n " ) )
87
87
88
- XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " Foo .swift" ] )
88
+ XCTAssertEqual ( try fs. getDirectoryContents ( path. appending ( component: " Sources " ) ) , [ " main .swift" ] )
89
89
XCTAssertBuilds ( path)
90
90
let triple = try UserToolchain . default. triple
91
91
let binPath = path. appending ( components: " .build " , triple. platformBuildPathComponent ( ) , " debug " )
You can’t perform that action at this time.
0 commit comments