Add support for Swift 5

.circleci/config.yml

@@ -8,7 +8,7 @@ workflows:
 jobs:
   build:
     macos:
-      xcode: "10.0.0"
+      xcode: "10.2.0"
     steps:
       - checkout
       - restore_cache:

.swift-version

@@ -1 +1 @@
-4.2
+5.0

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## next version
 
+### Added
+
+- **Breaking** Swift 5 support https://github.com/tuist/xcodeproj/pull/397 by @pepibumur.
+
 ## 6.7.0
 
 ### Changed

Cartfile

@@ -1,3 +1,3 @@
-github "tuist/PathKit" == 0.9.2
-github "tadija/AEXML" == 4.3.3
-github "kareman/SwiftShell" == 4.1.2
+github "kylef/PathKit" == 1.0.0
+github "tadija/AEXML" == 4.4.0
+github "tuist/shell" == 2.0.1

Package.resolved

@@ -6,35 +6,35 @@
         "repositoryURL": "https://github.com/tadija/AEXML",
         "state": {
           "branch": null,
-          "revision": "54bb8ea6fb693dd3f92a89e5fcc19e199fdeedd0",
-          "version": "4.3.3"
+          "revision": "e4d517844dd03dac557e35d77a8e9ab438de91a6",
+          "version": "4.4.0"
         }
       },
       {
         "package": "PathKit",
         "repositoryURL": "https://github.com/kylef/PathKit",
         "state": {
           "branch": null,
-          "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0",
-          "version": "0.9.2"
+          "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
+          "version": "1.0.0"
         }
       },
       {
-        "package": "Spectre",
-        "repositoryURL": "https://github.com/kylef/Spectre.git",
+        "package": "Shell",
+        "repositoryURL": "https://github.com/tuist/Shell",
         "state": {
           "branch": null,
-          "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5",
-          "version": "0.9.0"
+          "revision": "ab06e1ae3fa52c26b076ff11dde60e950f6bbc7c",
+          "version": "2.0.1"
         }
       },
       {
-        "package": "SwiftShell",
-        "repositoryURL": "https://github.com/kareman/SwiftShell",
+        "package": "Spectre",
+        "repositoryURL": "https://github.com/kylef/Spectre.git",
         "state": {
           "branch": null,
-          "revision": "beebe43c986d89ea5359ac3adcb42dac94e5e08a",
-          "version": "4.1.2"
+          "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5",
+          "version": "0.9.0"
         }
       }
     ]

Package.swift

@@ -8,16 +8,16 @@ let package = Package(
         .library(name: "xcodeproj", targets: ["xcodeproj"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/tadija/AEXML", .upToNextMinor(from: "4.3.3")),
-        .package(url: "https://github.com/kylef/PathKit", .upToNextMinor(from: "0.9.2")),
-        .package(url: "https://github.com/kareman/SwiftShell", .upToNextMinor(from: "4.1.2")),
+        .package(url: "https://github.com/tadija/AEXML", .upToNextMinor(from: "4.4.0")),
+        .package(url: "https://github.com/kylef/PathKit", .upToNextMinor(from: "1.0.0")),
+        .package(url: "https://github.com/tuist/Shell", .upToNextMinor(from: "2.0.1")),
     ],
     targets: [
         .target(name: "xcodeproj",
                 dependencies: [
                     "PathKit",
                     "AEXML",
                 ]),
-        .testTarget(name: "xcodeprojTests", dependencies: ["xcodeproj", "SwiftShell"]),
+        .testTarget(name: "xcodeprojTests", dependencies: ["xcodeproj", "Shell"]),
     ]
 )

Tests/xcodeprojTests/Objects/Files/PBXGroupTests.swift

@@ -1,6 +1,6 @@
 import Foundation
 import PathKit
-import SwiftShell
+import Shell
 import xcodeproj
 import XCTest
 
@@ -9,7 +9,7 @@ final class PBXGroupTests: XCTestCase {
         XCTAssertEqual(PBXGroup.isa, "PBXGroup")
     }
 
-    func test_addFile_assignParent() {
+    func test_addFile_assignParent() throws {
         let sourceRoot = Path("/")
         let project = PBXProj(
             rootObject: nil,
@@ -22,11 +22,9 @@ final class PBXGroupTests: XCTestCase {
                              sourceTree: .group,
                              name: "group")
         project.add(object: group)
-        let filePath = "\(Path.temporary.string)/file"
-        Files.createFile(atPath: filePath, contents: nil, attributes: nil)
-        let file = try? group.addFile(at: Path(filePath), sourceRoot: sourceRoot)
-
-        try! Files.removeItem(atPath: filePath)
+        let filePath = try Path.uniqueTemporary() + "file"
+        try Data().write(to: filePath.url)
+        let file = try? group.addFile(at: filePath, sourceRoot: sourceRoot)
         XCTAssertNotNil(file?.parent)
     }
 

Tests/xcodeprojTests/Objects/Project/PBXProjIntegrationTests.swift

@@ -1,10 +1,17 @@
 import Foundation
 import PathKit
-import SwiftShell
+import Shell
 import XCTest
 @testable import xcodeproj
 
 final class PBXProjIntegrationTests: XCTestCase {
+    var shell: Shell!
+
+    override func setUp() {
+        super.setUp()
+        shell = Shell()
+    }
+
     func test_init_initializesTheProjCorrectly() {
         let data = try! Data(contentsOf: fixturePath().url)
         let decoder = XcodeprojPropertyListDecoder()
@@ -37,15 +44,16 @@ final class PBXProjIntegrationTests: XCTestCase {
 
         try tmpDir.chdir {
             // Create a commit
-            SwiftShell.run(bash: "git init")
-            SwiftShell.run(bash: "git add .")
-            SwiftShell.run(bash: "git commit -m 'test'")
+            _ = try shell.capture(["git", "init"]).get()
+            _ = try shell.capture(["git", "add", "."]).get()
+            _ = try shell.capture(["git", "commit", "-m", "'test'"]).get()
 
             // Read/write the project
             let project = try XcodeProj(path: xcodeprojPath)
             try project.writePBXProj(path: xcodeprojPath, outputSettings: PBXOutputSettings())
 
-            XCTAssertTrue(SwiftShell.run(bash: "git status").stdout.contains("nothing to commit"))
+            let got = try shell.capture(["git", "status"]).get()
+            XCTAssertTrue(got.contains("nothing to commit"))
         }
     }