From 080738a8b26241bc55faeb6aacd81183e0d6c3c6 Mon Sep 17 00:00:00 2001 From: Abizer Nasir Date: Sun, 21 Nov 2021 17:41:38 +0000 Subject: [PATCH] Update the Swift starting point - Ignore the generated Xcode project from the repositiory - Bump the swift tools version to 5.5 (supported by Xcode 13+) - Tidy the Tests. LinuxMain, XCTestManifests and the allTests array are no longer needed as tests - are auto-discovered on non-apple platforms --- swift/.gitignore | 2 ++ swift/Package.swift | 2 +- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 4 ---- swift/Tests/GildedRoseTests/XCTestManifests.swift | 9 --------- swift/Tests/LinuxMain.swift | 7 ------- 5 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 swift/Tests/GildedRoseTests/XCTestManifests.swift delete mode 100644 swift/Tests/LinuxMain.swift diff --git a/swift/.gitignore b/swift/.gitignore index 95c43209..6ea2fdde 100644 --- a/swift/.gitignore +++ b/swift/.gitignore @@ -3,3 +3,5 @@ /Packages /*.xcodeproj xcuserdata/ +DerivedData/ +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata \ No newline at end of file diff --git a/swift/Package.swift b/swift/Package.swift index 8730f481..79c4c79f 100644 --- a/swift/Package.swift +++ b/swift/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 import PackageDescription diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 289352f2..40b28196 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -9,8 +9,4 @@ class GildedRoseTests: XCTestCase { app.updateQuality() XCTAssertEqual(app.items[0].name, "fixme") } - - static var allTests = [ - ("testFoo", testFoo), - ] } diff --git a/swift/Tests/GildedRoseTests/XCTestManifests.swift b/swift/Tests/GildedRoseTests/XCTestManifests.swift deleted file mode 100644 index 0409af2c..00000000 --- a/swift/Tests/GildedRoseTests/XCTestManifests.swift +++ /dev/null @@ -1,9 +0,0 @@ -import XCTest - -#if !canImport(ObjectiveC) -public func allTests() -> [XCTestCaseEntry] { - return [ - testCase(GildedRoseTests.allTests), - ] -} -#endif diff --git a/swift/Tests/LinuxMain.swift b/swift/Tests/LinuxMain.swift deleted file mode 100644 index 6d69d936..00000000 --- a/swift/Tests/LinuxMain.swift +++ /dev/null @@ -1,7 +0,0 @@ -import XCTest - -import GildedRoseTests - -var tests = [XCTestCaseEntry]() -tests += GildedRoseTests.allTests() -XCTMain(tests)