Convert SwiftPM to Swift 4

iSame7 · Oct 16, 2017 · 0d9795f · 0d9795f
1 parent 5aaa3b4
commit 0d9795f
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 42 deletions.
diff --git a/Package.swift b/Package.swift
@@ -205,5 +205,5 @@ let package = Package(
             name: "XcodeprojTests",
             dependencies: ["Xcodeproj", "TestSupport"]),
     ],
-    swiftLanguageVersions: [3]
+    swiftLanguageVersions: [4]
 )
diff --git a/Sources/Basic/NSRegularExpressionShim.swift b/Sources/Basic/NSRegularExpressionShim.swift
diff --git a/Sources/PackageDescription/Version.swift b/Sources/PackageDescription/Version.swift
@@ -62,7 +62,7 @@ extension Version: Hashable {
         if let build = buildMetadataIdentifier {
             result = (result &* mul) ^ UInt64(bitPattern: Int64(build.hashValue))
         }
-        return Int(truncatingBitPattern: result)
+        return Int(truncatingIfNeeded: result)
     }
 }
 

diff --git a/Sources/PackageDescription4/Version.swift b/Sources/PackageDescription4/Version.swift
@@ -63,7 +63,7 @@ extension Version: Hashable {
         result = (result &* mul) ^ UInt64(bitPattern: Int64(patch.hashValue))
         result = prereleaseIdentifiers.reduce(result, { ($0 &* mul) ^ UInt64(bitPattern: Int64($1.hashValue)) })
         result = buildMetadataIdentifiers.reduce(result, { ($0 &* mul) ^ UInt64(bitPattern: Int64($1.hashValue)) })
-        return Int(truncatingBitPattern: result)
+        return Int(truncatingIfNeeded: result)
     }
 }
 

diff --git a/Sources/PackageModel/Module.swift b/Sources/PackageModel/Module.swift
@@ -180,7 +180,7 @@ extension Sources {
         let isLibrary = !relativePaths.contains { path in
             let file = path.basename.lowercased()
             // Look for a main.xxx file avoiding cases like main.xxx.xxx
-            return file.hasPrefix("main.") && file.filter({$0 == "."}).count == 1
+            return file.hasPrefix("main.") && String(file.filter({$0 == "."})).count == 1
         }
         return isLibrary ? .library : .executable
     }

diff --git a/Sources/TestSupport/XCTestCasePerf.swift b/Sources/TestSupport/XCTestCasePerf.swift
@@ -19,7 +19,7 @@ import XCTest
 open class XCTestCasePerf: XCTestCase {
 
   #if os(macOS) && !ENABLE_PERF_TESTS
-    override open class func defaultTestSuite() -> XCTestSuite {
+    override open class var defaultTestSuite: XCTestSuite {
         return XCTestSuite(name: String(describing: type(of: self)))
     }
   #endif

diff --git a/Sources/Utility/PkgConfig.swift b/Sources/Utility/PkgConfig.swift
@@ -278,7 +278,7 @@ struct PkgConfigParser {
                 // Append the value of the variable.
                 result += variableValue
                 // Update the fragment with post variable string.
-                fragment = fragment[fragment.index(after: variable.endIndex)..<fragment.endIndex]
+                fragment = String(fragment[fragment.index(after: variable.endIndex)...])
             } else {
                 // No variable found, just append rest of the fragment to result.
                 result += fragment

diff --git a/Sources/Utility/Version.swift b/Sources/Utility/Version.swift
@@ -65,7 +65,7 @@ extension Version: Hashable {
         result = (result &* mul) ^ UInt64(bitPattern: Int64(patch.hashValue))
         result = prereleaseIdentifiers.reduce(result, { ($0 &* mul) ^ UInt64(bitPattern: Int64($1.hashValue)) })
         result = buildMetadataIdentifiers.reduce(result, { ($0 &* mul) ^ UInt64(bitPattern: Int64($1.hashValue)) })
-        return Int(truncatingBitPattern: result)
+        return Int(truncatingIfNeeded: result)
     }
 }
 

diff --git a/Sources/Utility/misc.swift b/Sources/Utility/misc.swift
@@ -22,7 +22,7 @@ public func getClangVersion(versionOutput: String) -> (major: Int, minor: Int)?
     }
     let versionStartIndex = clangVersionString.index(clangVersionString.startIndex,
         offsetBy: versionStringPrefix.utf8.count)
-    let versionString: String = clangVersionString[versionStartIndex..<clangVersionString.endIndex]
+    let versionString = clangVersionString[versionStartIndex...]
     // Split major minor patch etc.
     let versions = versionString.utf8.split(separator: UInt8(ascii: ".")).flatMap(String.init)
     guard versions.count > 1, let major = Int(versions[0]), let minor = Int(versions[1]) else {

diff --git a/Sources/Workspace/Workspace.swift b/Sources/Workspace/Workspace.swift
@@ -1159,10 +1159,10 @@ extension Workspace {
             case (.removed, .removed): return true
             case (.unchanged, .unchanged): return true
             case (.updated(let a), .updated(let b)): return a == b
-            case (.added(_), _): return false
-            case (.removed(_), _): return false
-            case (.unchanged(_), _): return false
-            case (.updated(_), _): return false
+            case (.added, _): return false
+            case (.removed, _): return false
+            case (.unchanged, _): return false
+            case (.updated, _): return false
             }
         }
     }

diff --git a/Sources/swiftpm-xctest-helper/main.swift b/Sources/swiftpm-xctest-helper/main.swift
@@ -33,7 +33,7 @@ func run() throws {
     guard let bundle = Bundle(path: bundlePath), bundle.load() else {
         throw Error.unableToLoadBundle(bundlePath)
     }
-    let suite = XCTestSuite.default()
+    let suite = XCTestSuite.default
 
     let splitSet: Set<Character> = ["[", " ", "]", ":"]
 
@@ -63,7 +63,7 @@ func run() throws {
             if let firstTest = testCaseSuite.tests.first {
                 name = String(reflecting: type(of: firstTest))
             } else {
-                name = testCaseSuite.name ?? "nil"
+                name = testCaseSuite.name
             }
 
             // Collect the test methods.
@@ -85,7 +85,7 @@ func run() throws {
             return ["name": name as NSString, "tests": tests as NSArray]
         })
         testCases.append([
-            "name": (testCaseSuite.name ?? "nil") as NSString,
+            "name": testCaseSuite.name as NSString,
             "tests": testSuite as NSArray,
         ])
     }

diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -1355,7 +1355,7 @@ final class WorkspaceTests: XCTestCase {
         )
 
         // Load the graph.
-        workspace.checkPackageGraph(roots: ["Root"]) { _ in }
+        workspace.checkPackageGraph(roots: ["Root"]) { _, _ in }
 
         // Edit foo.
         let fooPath = workspace.createWorkspace().editablesPath.appending(component: "Foo")

diff --git a/Utilities/bootstrap b/Utilities/bootstrap
@@ -221,8 +221,7 @@ class Target(object):
         if args.libdispatch_source_dir:
             other_args.extend(["-Xcc", "-fblocks"])
 
-	# FIXME: Default to swift version 3 for now.
-        other_args.extend(["-swift-version", "3"])
+        other_args.extend(["-swift-version", "4"])
 
         print("  %s:" % json.dumps(compile_swift_node), file=output)
         print("    tool: swift-compiler", file=output)
@@ -1216,9 +1215,7 @@ def main():
         if not os.path.exists(os.path.dirname(xcconfig_path)):
             mkdir_p(os.path.dirname(xcconfig_path))
         with open(xcconfig_path, "w") as f:
-            # Add hardcoded `-swift-version 3` in other swift flags for Xcode 8.3 support.
-            if find_xcode_version().startswith("Xcode 8.3"):
-                print("OTHER_SWIFT_FLAGS = $(inherited) -swift-version 3", file=f)
+            print("\n", file=f)
         cmd += ["--xcconfig-overrides", xcconfig_path]
 
         # Call `swift-package` to generate the Xcode project.