Update the project to Swift 5.4 (#125)

* Update the project to Swift 5.4 - Splash 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. * Remove LinuxMain.swift
JohnSundell · Jun 14, 2021 · 7f87f19 · 7f87f19
1 parent 4df8c3e
commit 7f87f19
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 431 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.4
 
 /**
  *  Splash
@@ -19,19 +19,19 @@ let package = Package(
     ],
     targets: [
         .target(name: "Splash"),
-        .target(
+        .executableTarget(
             name: "SplashMarkdown",
             dependencies: ["Splash"]
         ),
-        .target(
+        .executableTarget(
             name: "SplashHTMLGen",
             dependencies: ["Splash"]
         ),
-        .target(
+        .executableTarget(
             name: "SplashImageGen",
             dependencies: ["Splash"]
         ),
-        .target(
+        .executableTarget(
             name: "SplashTokenizer",
             dependencies: ["Splash"]
         ),

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
diff --git a/Tests/SplashTests/Core/SplashTestCase.swift b/Tests/SplashTests/Core/SplashTestCase.swift
diff --git a/Tests/SplashTests/Core/SyntaxHighlighterTestCase.swift b/Tests/SplashTests/Core/SyntaxHighlighterTestCase.swift
@@ -10,7 +10,7 @@ import Splash
 
 /// Test case used as an abstract base class for all tests relating to
 /// syntax highlighting. For all such tests, the Swift grammar is used.
-class SyntaxHighlighterTestCase: SplashTestCase {
+class SyntaxHighlighterTestCase: XCTestCase {
     private(set) var highlighter: SyntaxHighlighter<OutputFormatMock>!
     private(set) var builder: OutputBuilderMock!
 

diff --git a/Tests/SplashTests/Core/TestCaseVerifier.swift b/Tests/SplashTests/Core/TestCaseVerifier.swift
diff --git a/Tests/SplashTests/Core/TestClosure.swift b/Tests/SplashTests/Core/TestClosure.swift
diff --git a/Tests/SplashTests/Core/XCTestCase+TestNames.swift b/Tests/SplashTests/Core/XCTestCase+TestNames.swift
diff --git a/Tests/SplashTests/Core/XCTestManifests.swift b/Tests/SplashTests/Core/XCTestManifests.swift
diff --git a/Tests/SplashTests/Tests/ClosureTests.swift b/Tests/SplashTests/Tests/ClosureTests.swift
@@ -259,28 +259,4 @@ final class ClosureTests: SyntaxHighlighterTestCase {
             .plainText("}")
         ])
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension ClosureTests {
-    static var allTests: [(String, TestClosure<ClosureTests>)] {
-        return [
-            ("testTrailingClosureWithArguments", testTrailingClosureWithArguments),
-            ("testTrailingClosureWithoutParanthesis", testTrailingClosureWithoutParanthesis),
-            ("testEmptyTrailingClosure", testEmptyTrailingClosure),
-            ("testClosureArgumentWithSingleArgument", testClosureArgumentWithSingleArgument),
-            ("testClosureArgumentWithMultipleArguments", testClosureArgumentWithMultipleArguments),
-            ("testEscapingClosureArgument", testEscapingClosureArgument),
-            ("testClosureWithInoutArgument", testClosureWithInoutArgument),
-            ("testPassingClosureAsArgument", testPassingClosureAsArgument),
-            ("testNestedEscapingClosure", testNestedEscapingClosure),
-            ("testClosureArgumentShorthands", testClosureArgumentShorthands),
-            ("testClosureWithWeakSelfCaptureList", testClosureWithWeakSelfCaptureList),
-            ("testClosureWithUnownedSelfCaptureList", testClosureWithUnownedSelfCaptureList),
-            ("testClosureWithSingleFunctionCall", testClosureWithSingleFunctionCall)
-        ]
-    }
 }
diff --git a/Tests/SplashTests/Tests/CommentTests.swift b/Tests/SplashTests/Tests/CommentTests.swift
@@ -358,31 +358,4 @@ final class CommentTests: SyntaxHighlighterTestCase {
             .plainText("}")
         ])
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension CommentTests {
-    static var allTests: [(String, TestClosure<CommentTests>)] {
-        return [
-            ("testSingleLineComment", testSingleLineComment),
-            ("testMultiLineComment", testMultiLineComment),
-            ("testMultiLineCommentWithDoubleAsterisks", testMultiLineCommentWithDoubleAsterisks),
-            ("testMutliLineDocumentationComment", testMutliLineDocumentationComment),
-            ("testCommentStartingWithPunctuation", testCommentStartingWithPunctuation),
-            ("testCommentEndingWithComma", testCommentEndingWithComma),
-            ("testCommentPrecededByComma", testCommentPrecededByComma),
-            ("testCommentWithNumber", testCommentWithNumber),
-            ("testCommentWithNoWhiteSpaceToPunctuation", testCommentWithNoWhiteSpaceToPunctuation),
-            ("testCommentsNextToCurlyBrackets", testCommentsNextToCurlyBrackets),
-            ("testCommentWithinGenericTypeList", testCommentWithinGenericTypeList),
-            ("testCommentsNextToGenericTypeList", testCommentsNextToGenericTypeList),
-            ("testCommentsNextToInitialization", testCommentsNextToInitialization),
-            ("testCommentsNextToProtocolName", testCommentsNextToProtocolName),
-            ("testCommentsAfterOptionalTypes", testCommentsAfterOptionalTypes),
-            ("testCommentsAfterArrayTypes", testCommentsAfterArrayTypes)
-        ]
-    }
 }
diff --git a/Tests/SplashTests/Tests/DeclarationTests.swift b/Tests/SplashTests/Tests/DeclarationTests.swift
@@ -1326,67 +1326,4 @@ final class DeclarationTests: SyntaxHighlighterTestCase {
             .plainText("}")
         ])
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension DeclarationTests {
-    static var allTests: [(String, TestClosure<DeclarationTests>)] {
-        return [
-            ("testFunctionDeclaration", testFunctionDeclaration),
-            ("testRequiredFunctionDeclaration", testRequiredFunctionDeclaration),
-            ("testPublicFunctionDeclarationWithDocumentationEndingWithDot", testPublicFunctionDeclarationWithDocumentationEndingWithDot),
-            ("testFunctionDeclarationWithEmptyExternalLabel", testFunctionDeclarationWithEmptyExternalLabel),
-            ("testFunctionDeclarationWithKeywordArgumentLabel", testFunctionDeclarationWithKeywordArgumentLabel),
-            ("testFunctionDeclarationWithKeywordArgumentLabelOnNewLine", testFunctionDeclarationWithKeywordArgumentLabelOnNewLine),
-            ("testGenericFunctionDeclarationWithKeywordArgumentLabel", testGenericFunctionDeclarationWithKeywordArgumentLabel),
-            ("testGenericFunctionDeclarationWithoutConstraints", testGenericFunctionDeclarationWithoutConstraints),
-            ("testGenericFunctionDeclarationWithSingleConstraint", testGenericFunctionDeclarationWithSingleConstraint),
-            ("testGenericFunctionDeclarationWithMultipleConstraints", testGenericFunctionDeclarationWithMultipleConstraints),
-            ("testGenericFunctionDeclarationWithGenericParameter", testGenericFunctionDeclarationWithGenericParameter),
-            ("testFunctionDeclarationWithGenericReturnType", testFunctionDeclarationWithGenericReturnType),
-            ("testGenericStructDeclaration", testGenericStructDeclaration),
-            ("testClassDeclaration", testClassDeclaration),
-            ("testCompactClassDeclarationWithInitializer", testCompactClassDeclarationWithInitializer),
-            ("testClassDeclarationWithDeinit", testClassDeclarationWithDeinit),
-            ("testClassDeclarationWithMultipleProtocolConformances", testClassDeclarationWithMultipleProtocolConformances),
-            ("testSubclassDeclaration", testSubclassDeclaration),
-            ("testGenericSubclassDeclaration", testGenericSubclassDeclaration),
-            ("testProtocolDeclaration", testProtocolDeclaration),
-            ("testProtocolDeclarationWithAssociatedTypes", testProtocolDeclarationWithAssociatedTypes),
-            ("testExtensionDeclaration", testExtensionDeclaration),
-            ("testExtensionDeclarationWithConvenienceInitializer", testExtensionDeclarationWithConvenienceInitializer),
-            ("testExtensionDeclarationWithConstraint", testExtensionDeclarationWithConstraint),
-            ("testLazyPropertyDeclaration", testLazyPropertyDeclaration),
-            ("testDynamicPropertyDeclaration", testDynamicPropertyDeclaration),
-            ("testGenericPropertyDeclaration", testGenericPropertyDeclaration),
-            ("testPropertyDeclarationWithWillSet", testPropertyDeclarationWithWillSet),
-            ("testPropertyDeclarationWithDidSet", testPropertyDeclarationWithDidSet),
-            ("testPropertyWithCommentedDidSet", testPropertyWithCommentedDidSet),
-            ("testPropertyWithSetterAccessLevel", testPropertyWithSetterAccessLevel),
-            ("testPropertyDeclarationAfterCommentEndingWithVarKeyword", testPropertyDeclarationAfterCommentEndingWithVarKeyword),
-            ("testPropertyDeclarationWithStaticPropertyDefaultValue", testPropertyDeclarationWithStaticPropertyDefaultValue),
-            ("testSubscriptDeclaration", testSubscriptDeclaration),
-            ("testGenericSubscriptDeclaration", testGenericSubscriptDeclaration),
-            ("testDeferDeclaration", testDeferDeclaration),
-            ("testFunctionDeclarationWithInOutParameter", testFunctionDeclarationWithInOutParameter),
-            ("testFunctionDeclarationWithIgnoredParameter", testFunctionDeclarationWithIgnoredParameter),
-            ("testFunctionDeclarationWithNonEscapedKeywordAsName", testFunctionDeclarationWithNonEscapedKeywordAsName),
-            ("testFunctionDeclarationWithEscapedKeywordAsName", testFunctionDeclarationWithEscapedKeywordAsName),
-            ("testFunctionDeclarationWithPreProcessors", testFunctionDeclarationWithPreProcessors),
-            ("testNonMutatingFunction", testNonMutatingFunction),
-            ("testRethrowingFunctionDeclaration", testRethrowingFunctionDeclaration),
-            ("testFunctionDeclarationWithOpaqueReturnType", testFunctionDeclarationWithOpaqueReturnType),
-            ("testPrefixFunctionDeclaration", testPrefixFunctionDeclaration),
-            ("testEnumDeclarationWithSomeCase", testEnumDeclarationWithSomeCase),
-            ("testIndirectEnumDeclaration", testIndirectEnumDeclaration),
-            ("testPropertyWrapperDeclaration", testPropertyWrapperDeclaration),
-            ("testWrappedPropertyDeclarations", testWrappedPropertyDeclarations),
-            ("testWrappedPropertyDeclarationUsingNestedType", testWrappedPropertyDeclarationUsingNestedType),
-            ("testWrappedPropertyDeclarationUsingExplicitType", testWrappedPropertyDeclarationUsingExplicitType),
-            ("testGenericInitializerDeclaration", testGenericInitializerDeclaration)
-        ]
-    }
 }
diff --git a/Tests/SplashTests/Tests/EnumTests.swift b/Tests/SplashTests/Tests/EnumTests.swift
@@ -57,19 +57,4 @@ final class EnumTests: SyntaxHighlighterTestCase {
             .plainText("]")
         ])
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension EnumTests {
-    static var allTests: [(String, TestClosure<EnumTests>)] {
-        return [
-            ("testEnumDotSyntaxInAssignment", testEnumDotSyntaxInAssignment),
-            ("testEnumDotSyntaxAsArgument", testEnumDotSyntaxAsArgument),
-            ("testEnumDotSyntaxWithAssociatedValueTreatedAsCall", testEnumDotSyntaxWithAssociatedValueTreatedAsCall),
-            ("testUsingEnumInSubscript", testUsingEnumInSubscript)
-        ]
-    }
 }
diff --git a/Tests/SplashTests/Tests/FunctionCallTests.swift b/Tests/SplashTests/Tests/FunctionCallTests.swift
@@ -249,32 +249,4 @@ final class FunctionCallTests: SyntaxHighlighterTestCase {
             .plainText("}")
         ])
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension FunctionCallTests {
-    static var allTests: [(String, TestClosure<FunctionCallTests>)] {
-        return [
-            ("testFunctionCallWithIntegers", testFunctionCallWithIntegers),
-            ("testFunctionCallWithNil", testFunctionCallWithNil),
-            ("testImplicitInitializerCall", testImplicitInitializerCall),
-            ("testExplicitInitializerCall", testExplicitInitializerCall),
-            ("testExplicitInitializerCallUsingTrailingClosureSyntax", testExplicitInitializerCallUsingTrailingClosureSyntax),
-            ("testDotSyntaxInitializerCall", testDotSyntaxInitializerCall),
-            ("testAccessingPropertyAfterFunctionCallWithoutArguments", testAccessingPropertyAfterFunctionCallWithoutArguments),
-            ("testAccessingPropertyAfterFunctionCallWithArguments", testAccessingPropertyAfterFunctionCallWithArguments),
-            ("testCallingStaticMethodOnGenericType", testCallingStaticMethodOnGenericType),
-            ("testPassingTypeToFunction", testPassingTypeToFunction),
-            ("testPassingBoolToUnnamedArgument", testPassingBoolToUnnamedArgument),
-            ("testIndentedFunctionCalls", testIndentedFunctionCalls),
-            ("testXCTAssertCalls", testXCTAssertCalls),
-            ("testUsingTryKeywordWithinFunctionCall", testUsingTryKeywordWithinFunctionCall),
-            ("testCallingFunctionsWithProjectedPropertyWrapperValues", testCallingFunctionsWithProjectedPropertyWrapperValues),
-            ("testCallingFunctionWithInoutProjectedPropertyWrapperValue", testCallingFunctionWithInoutProjectedPropertyWrapperValue),
-            ("testCallingMethodWithSameNameAsKeywordWithTrailingClosureSyntax", testCallingMethodWithSameNameAsKeywordWithTrailingClosureSyntax)
-        ]
-    }
 }
diff --git a/Tests/SplashTests/Tests/HTMLOutputFormatTests.swift b/Tests/SplashTests/Tests/HTMLOutputFormatTests.swift
@@ -2,7 +2,7 @@ import Foundation
 import XCTest
 import Splash
 
-final class HTMLOutputFormatTests: SplashTestCase {
+final class HTMLOutputFormatTests: XCTestCase {
     private var highlighter: SyntaxHighlighter<HTMLOutputFormat>!
 
     override func setUp() {
@@ -39,18 +39,4 @@ final class HTMLOutputFormatTests: SplashTestCase {
         <span class="comment">// Hey I'm a comment!</span>
         """)
     }
-
-    func testAllTestsRunOnLinux() {
-        XCTAssertTrue(TestCaseVerifier.verifyLinuxTests((type(of: self)).allTests))
-    }
-}
-
-extension HTMLOutputFormatTests {
-    static var allTests: [(String, TestClosure<HTMLOutputFormatTests>)] {
-        return [
-            ("testBasicGeneration", testBasicGeneration),
-            ("testStrippingGreaterAndLessThanCharactersFromOutput", testStrippingGreaterAndLessThanCharactersFromOutput),
-            ("testCommentMerging", testCommentMerging)
-        ]
-    }
 }