Update the project to Swift 5.4 (#110)

JohnSundell · web-flow · commit c932b3557609 · 2021-05-03T11:43:17.000+02:00
- Publish now uses the Swift 5.4 toolchain.
- Since Swift 5.4 now enables automatic test discovery on all supported platforms, all of the
   infrastructure that was previously used to maintain Linux unit testing compatibility has now
   been removed.
- Bump Ink to version 0.5.1, which includes a fix for Swift 5.4 compatibility.
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.4
 
 /**
 *  Publish
@@ -29,7 +29,7 @@ let package = Package(
                 "Ink", "Plot", "Files", "Codextended", "ShellOut", "Sweep"
             ]
         ),
-        .target(
+        .executableTarget(
             name: "PublishCLI",
             dependencies: ["PublishCLICore"]
         ),
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
diff --git a/Tests/PublishTests/Infrastructure/LinuxCompatibility.swift b/Tests/PublishTests/Infrastructure/LinuxCompatibility.swift
diff --git a/Tests/PublishTests/Infrastructure/XCTestManifests.swift b/Tests/PublishTests/Infrastructure/XCTestManifests.swift
diff --git a/Tests/PublishTests/Tests/CLITests.swift b/Tests/PublishTests/Tests/CLITests.swift
@@ -89,22 +89,6 @@ final class CLITests: PublishTestCase {
     }
 }
 
-extension CLITests {
-    static var allTests: Linux.TestList<CLITests> {
-        [
-            ("testWebsiteProjectGeneration", testWebsiteProjectGeneration),
-            ("testPluginProjectGeneration", testPluginProjectGeneration),
-            ("testSiteName", testSiteName),
-            ("testSiteNameFromLowercasedFolderName", testSiteNameFromLowercasedFolderName),
-            ("testSiteNameFromFolderNameStartingWithDigit", testSiteNameFromFolderNameStartingWithDigit),
-            ("testSiteNameFromCamelCaseFolderName", testSiteNameFromCamelCaseFolderName),
-            ("testSiteNameWithNonLetterValidCharactersFolderName", testSiteNameWithNonLetterValidCharactersFolderName),
-            ("testSiteNameFromFolderNameWithNonLetters", testSiteNameFromFolderNameWithNonLetters),
-            ("testSiteNameFromDigitsOnlyFolderName", testSiteNameFromDigitsOnlyFolderName)
-        ]
-    }
-}
-
 private extension CLITests {
     func makeCLI(in folder: Folder, command: String...) throws -> CLI {
         let thisFile = try File(path: "\(#file)")
diff --git a/Tests/PublishTests/Tests/ContentMutationTests.swift b/Tests/PublishTests/Tests/ContentMutationTests.swift
@@ -289,25 +289,3 @@ final class ContentMutationTests: PublishTestCase {
         XCTAssertEqual(site.pages["b"]?.title, "")
     }
 }
-
-extension ContentMutationTests {
-    static var allTests: Linux.TestList<ContentMutationTests> {
-        [
-            ("testAddingItemUsingClosureAPI", testAddingItemUsingClosureAPI),
-            ("testAddingItemUsingPlotHierarchy", testAddingItemUsingPlotHierarchy),
-            ("testRemovingItemsMatchingPredicate", testRemovingItemsMatchingPredicate),
-            ("testMutatingAllSections", testMutatingAllSections),
-            ("testMutatingAllItems", testMutatingAllItems),
-            ("testMutatingItemsInSection", testMutatingItemsInSection),
-            ("testMutatingItemsMatchingPredicate", testMutatingItemsMatchingPredicate),
-            ("testMutatingItemsByChangingTags", testMutatingItemsByChangingTags),
-            ("testMutatingItemsByRemovingTags", testMutatingItemsByRemovingTags),
-            ("testSortingItems", testSortingItems),
-            ("testSortingItemsInSection", testSortingItemsInSection),
-            ("testMutatingItemUsingContentProxyProperties", testMutatingItemUsingContentProxyProperties),
-            ("testMutatingPage", testMutatingPage),
-            ("testMutatingPageByChangingPath", testMutatingPageByChangingPath),
-            ("testMutatingAllPagesMatchingPredicate", testMutatingAllPagesMatchingPredicate)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/DeploymentTests.swift b/Tests/PublishTests/Tests/DeploymentTests.swift
@@ -146,15 +146,3 @@ final class DeploymentTests: PublishTestCase {
         XCTAssertTrue(subfolder.containsSubfolder(at: "one/a"))
     }
 }
-
-extension DeploymentTests {
-    static var allTests: Linux.TestList<DeploymentTests> {
-        [
-            ("testDeploymentSkippedByDefault", testDeploymentSkippedByDefault),
-            ("testGenerationStepsAndPluginsSkippedWhenDeploying", testGenerationStepsAndPluginsSkippedWhenDeploying),
-            ("testGitDeploymentMethod", testGitDeploymentMethod),
-            ("testGitDeploymentMethodWithError", testGitDeploymentMethodWithError),
-            ("testDeployingUsingCustomOutputFolder", testDeployingUsingCustomOutputFolder)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/ErrorTests.swift b/Tests/PublishTests/Tests/ErrorTests.swift
@@ -169,19 +169,3 @@ final class ErrorTests: PublishTestCase {
         CommandLine.arguments.removeLast()
     }
 }
-
-extension ErrorTests {
-    static var allTests: Linux.TestList<ErrorTests> {
-        [
-            ("testErrorForInvalidRootPath", testErrorForInvalidRootPath),
-            ("testErrorForMissingMarkdownMetadata", testErrorForMissingMarkdownMetadata),
-            ("testErrorForInvalidMarkdownMetadata", testErrorForInvalidMarkdownMetadata),
-            ("testErrorForThrowingDuringItemMutation", testErrorForThrowingDuringItemMutation),
-            ("testErrorForMissingPage", testErrorForMissingPage),
-            ("testErrorForThrowingDuringPageMutation", testErrorForThrowingDuringPageMutation),
-            ("testErrorForMissingFolder", testErrorForMissingFolder),
-            ("testErrorForMissingFile", testErrorForMissingFile),
-            ("testErrorForNoPublishingSteps", testErrorForNoPublishingSteps)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/FileIOTests.swift b/Tests/PublishTests/Tests/FileIOTests.swift
@@ -134,19 +134,3 @@ final class FileIOTests: PublishTestCase {
         XCTAssertFalse(folder.containsFile(named: "Output/.hidden"))
     }
 }
-
-extension FileIOTests {
-    static var allTests: Linux.TestList<FileIOTests> {
-        [
-            ("testCopyingFile", testCopyingFile),
-            ("testCopyingFileToSpecificFolder", testCopyingFileToSpecificFolder),
-            ("testCopyingFolder", testCopyingFolder),
-            ("testCopyingResourcesWithFolder", testCopyingResourcesWithFolder),
-            ("testCopyingResourcesWithoutFolder", testCopyingResourcesWithoutFolder),
-            ("testCreatingRootLevelFolder", testCreatingRootLevelFolder),
-            ("testRetrievingOutputFolder", testRetrievingOutputFolder),
-            ("testRetrievingOutputFile", testRetrievingOutputFile),
-            ("testCleaningHiddenFilesInOutputFolder", testCleaningHiddenFilesInOutputFolder)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/HTMLGenerationTests.swift b/Tests/PublishTests/Tests/HTMLGenerationTests.swift
@@ -324,22 +324,3 @@ final class HTMLGenerationTests: PublishTestCase {
         XCTAssertTrue(try tagDetails.readAsString().contains("tagA"))
     }
 }
-
-extension HTMLGenerationTests {
-    static var allTests: Linux.TestList<HTMLGenerationTests> {
-        [
-            ("testGeneratingIndexHTML", testGeneratingIndexHTML),
-            ("testGeneratingSectionHTML", testGeneratingSectionHTML),
-            ("testGeneratingItemHTML", testGeneratingItemHTML),
-            ("testGeneratingNestedItemHTML", testGeneratingNestedItemHTML),
-            ("testGeneratingPageHTML", testGeneratingPageHTML),
-            ("testGeneratingTagHTML", testGeneratingTagHTML),
-            ("testCleaningUpOldHTMLFiles", testCleaningUpOldHTMLFiles),
-            ("testAlwaysGeneratingIndexPageForAllSections", testAlwaysGeneratingIndexPageForAllSections),
-            ("testNotGeneratingTagHTMLForIncompatibleTheme", testNotGeneratingTagHTMLForIncompatibleTheme),
-            ("testNotGeneratingTagHTMLWhenDisabled", testNotGeneratingTagHTMLWhenDisabled),
-            ("testGeneratingStandAloneHTMLFiles", testGeneratingStandAloneHTMLFiles),
-            ("testFoundationTheme", testFoundationTheme)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/MarkdownTests.swift b/Tests/PublishTests/Tests/MarkdownTests.swift
@@ -150,18 +150,3 @@ final class MarkdownTests: PublishTestCase {
         XCTAssertEqual(site.sections[.one].items, [])
     }
 }
-
-extension MarkdownTests {
-    static var allTests: Linux.TestList<MarkdownTests> {
-        [
-            ("testParsingFileWithTitle", testParsingFileWithTitle),
-            ("testParsingFileWithOverriddenTitle", testParsingFileWithOverriddenTitle),
-            ("testParsingFileWithNoTitle", testParsingFileWithNoTitle),
-            ("testParsingFileWithOverriddenPath", testParsingFileWithOverriddenPath),
-            ("testParsingFileWithBuiltInMetadata", testParsingFileWithBuiltInMetadata),
-            ("testParsingFileWithCustomMetadata", testParsingFileWithCustomMetadata),
-            ("testParsingPageInNestedFolder", testParsingPageInNestedFolder),
-            ("testNotParsingNonMarkdownFiles", testNotParsingNonMarkdownFiles)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/PathTests.swift b/Tests/PublishTests/Tests/PathTests.swift
@@ -34,14 +34,3 @@ final class PathTests: PublishTestCase {
         XCTAssertEqual(wrapper, try data.decoded())
     }
 }
-
-extension PathTests {
-    static var allTests: Linux.TestList<PathTests> {
-        [
-            ("testAbsoluteString", testAbsoluteString),
-            ("testAppendingComponent", testAppendingComponent),
-            ("testStringInterpolation", testStringInterpolation),
-            ("testCoding", testCoding)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/PlotComponentTests.swift b/Tests/PublishTests/Tests/PlotComponentTests.swift
@@ -81,15 +81,3 @@ final class PlotComponentTests: PublishTestCase {
         """)
     }
 }
-
-extension PlotComponentTests {
-    static var allTests: Linux.TestList<PlotComponentTests> {
-        [
-            ("testStylesheetPaths", testStylesheetPaths),
-            ("testRenderingAudioPlayer", testRenderingAudioPlayer),
-            ("testRenderingHostedVideoPlayer", testRenderingHostedVideoPlayer),
-            ("testRenderingYouTubeVideoPlayer", testRenderingYouTubeVideoPlayer),
-            ("testRenderingVimeoVideoPlayer", testRenderingVimeoVideoPlayer)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/PluginTests.swift b/Tests/PublishTests/Tests/PluginTests.swift
@@ -62,13 +62,3 @@ final class PluginTests: PublishTestCase {
         )
     }
 }
-
-extension PluginTests {
-    static var allTests: Linux.TestList<PluginTests> {
-        [
-            ("testAddingContentUsingPlugin", testAddingContentUsingPlugin),
-            ("testAddingInkModifierUsingPlugin", testAddingInkModifierUsingPlugin),
-            ("testAddingPluginToDefaultPipeline", testAddingPluginToDefaultPipeline)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/PodcastFeedGenerationTests.swift b/Tests/PublishTests/Tests/PodcastFeedGenerationTests.swift
@@ -164,20 +164,6 @@ final class PodcastFeedGenerationTests: PublishTestCase {
     }
 }
 
-extension PodcastFeedGenerationTests {
-    static var allTests: Linux.TestList<PodcastFeedGenerationTests> {
-        [
-            ("testOnlyIncludingSpecifiedSection", testOnlyIncludingSpecifiedSection),
-            ("testOnlyIncludingItemsMatchingPredicate", testOnlyIncludingItemsMatchingPredicate),
-            ("testConvertingRelativeLinksToAbsolute", testConvertingRelativeLinksToAbsolute),
-            ("testItemPrefixAndSuffix", testItemPrefixAndSuffix),
-            ("testReusingPreviousFeedIfNoItemsWereModified", testReusingPreviousFeedIfNoItemsWereModified),
-            ("testNotReusingPreviousFeedIfConfigChanged", testNotReusingPreviousFeedIfConfigChanged),
-            ("testNotReusingPreviousFeedIfItemWasAdded", testNotReusingPreviousFeedIfItemWasAdded)
-        ]
-    }
-}
-
 private extension PodcastFeedGenerationTests {
     typealias Site = WebsiteStub.WithPodcastMetadata
     typealias Configuration = PodcastFeedConfiguration<Site>
diff --git a/Tests/PublishTests/Tests/PublishingContextTests.swift b/Tests/PublishTests/Tests/PublishingContextTests.swift
@@ -23,11 +23,3 @@ final class PublishingContextTests: PublishTestCase {
         XCTAssertEqual(expectedOrder, actualOrder)
     }
 }
-
-extension PublishingContextTests {
-    static var allTests: Linux.TestList<PublishingContextTests> {
-        [
-            ("testSectionIterationOrder", testSectionIterationOrder)
-        ]
-    }
-}
diff --git a/Tests/PublishTests/Tests/RSSFeedGenerationTests.swift b/Tests/PublishTests/Tests/RSSFeedGenerationTests.swift
@@ -173,22 +173,6 @@ final class RSSFeedGenerationTests: PublishTestCase {
     }
 }
 
-extension RSSFeedGenerationTests {
-    static var allTests: Linux.TestList<RSSFeedGenerationTests> {
-        [
-            ("testOnlyIncludingSpecifiedSections", testOnlyIncludingSpecifiedSections),
-            ("testOnlyIncludingItemsMatchingPredicate", testOnlyIncludingItemsMatchingPredicate),
-            ("testConvertingRelativeLinksToAbsolute", testConvertingRelativeLinksToAbsolute),
-            ("testItemTitlePrefixAndSuffix", testItemTitlePrefixAndSuffix),
-            ("testItemBodyPrefixAndSuffix", testItemBodyPrefixAndSuffix),
-            ("testCustomItemLink", testCustomItemLink),
-            ("testReusingPreviousFeedIfNoItemsWereModified", testReusingPreviousFeedIfNoItemsWereModified),
-            ("testNotReusingPreviousFeedIfConfigChanged", testNotReusingPreviousFeedIfConfigChanged),
-            ("testNotReusingPreviousFeedIfItemWasAdded", testNotReusingPreviousFeedIfItemWasAdded)
-        ]
-    }
-}
-
 private extension RSSFeedGenerationTests {
     typealias Site = WebsiteStub.WithoutItemMetadata
 
diff --git a/Tests/PublishTests/Tests/SiteMapGenerationTests.swift b/Tests/PublishTests/Tests/SiteMapGenerationTests.swift
diff --git a/Tests/PublishTests/Tests/WebsiteTests.swift b/Tests/PublishTests/Tests/WebsiteTests.swift
