Merge pull request #7 from yutailang0119/develop

Support Xcode 11 and Swift 5.1
yutailang0119 · Oct 7, 2019 · baa36e0 · baa36e0
2 parents dbaa8a0 + 51c27fc
commit baa36e0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
+.build
+/.previous-build
+xcuserdata
 .DS_Store
-/.build
-/Packages
-/*.xcodeproj
+*.xcodeproj
+.swiftpm
+Package.resolved
+
diff --git a/Package.resolved b/Package.resolved
@@ -5,18 +5,18 @@
         "package": "llbuild",
         "repositoryURL": "https://github.com/apple/swift-llbuild.git",
         "state": {
-          "branch": "master",
-          "revision": "3aeecb428d202afe15633266dc862de27feab723",
-          "version": null
+          "branch": null,
+          "revision": "f73b84bc1525998e5e267f9d830c1411487ac65e",
+          "version": "0.2.0"
         }
       },
       {
         "package": "SwiftPM",
         "repositoryURL": "https://github.com/apple/swift-package-manager.git",
         "state": {
-          "branch": "swift-5.0.1-RELEASE",
-          "revision": "3a57975e10be0b1a8b87992ddf3a49701036f96c",
-          "version": null
+          "branch": null,
+          "revision": "9abcc2260438177cecd7cf5185b144d13e74122b",
+          "version": "0.5.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,7 +9,7 @@ let package = Package(
         .library(name: "ProgressSpinnerKit", targets: ["ProgressSpinnerKit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-package-manager.git", .revision("swift-5.0.1-RELEASE")),
+        .package(url: "https://github.com/apple/swift-package-manager.git", from: "0.5.0"),
     ],
     targets: [
         .target(name: "ProgressSpinnerKit", dependencies: ["SPMUtility"]),

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="left">
-  <a href="https://developer.apple.com/swift"><img alt="Swift 4.1" src="https://img.shields.io/badge/Swift-4.1-orange.svg?style=flat"/></a>
+  <a href="https://developer.apple.com/swift"><img alt="Swift 5.1" src="https://img.shields.io/badge/Swift-5.1-orange.svg?style=flat"/></a>
   <a href="https://swift.org/package-manager/"><img alt="Swift Package Manager" src="https://img.shields.io/badge/Swift_Package_Manager-compatible-green.svg?style=flat"/></a>
   <a href="https://github.com/yutailang0119/ProgressSpinnerKit/blob/master/LICENSE"><img alt="Lincense" src="https://img.shields.io/badge/license-MIT-black.svg?style=flat"/></a>
 </p>
@@ -27,15 +27,15 @@ ProgressSpinnerKit is still in active development.
 ### [Swift Package Manager](https://swift.org/package-manager/)
 
 ```swift
-// swift-tools-version:4.0
+// swift-tools-version:5.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "test",
     dependencies: [
-        .package(url: "https://github.com/yutailang0119/ProgressSpinnerKit", from: "0.1.0"),
+        .package(url: "https://github.com/yutailang0119/ProgressSpinnerKit", from: "0.3.0"),
     ],
     targets: [
         .target(name: "targetName", dependencies: ["ProgressSpinnerKit"]),

diff --git a/Tests/ProgressSpinnerKitTests/ProgressSpinnerTests.swift b/Tests/ProgressSpinnerKitTests/ProgressSpinnerTests.swift
@@ -20,7 +20,8 @@ final class ProgressSpinnerTests: XCTestCase {
 
     /// Test progress bar when writing to a non tty stream.
     func testSimpleProgresSpinner() {
-        let outStream = BufferedOutputByteStream()
+        let byteStream = BufferedOutputByteStream()
+        let outStream = ThreadSafeOutputByteStream(byteStream)
         let spinner = Spinner(kind: Spinner.Kind.allCases.randomElement()!)
         let isShowStopped = Bool.random()
         let headerText = "test"
@@ -37,7 +38,7 @@ final class ProgressSpinnerTests: XCTestCase {
         let verificationFrames = (0..<frameCount).reduce(into: "\(headerText)\n") { result, _ in
             result += "\(verificationSpinner.frame)\n"
         } + verificationSuffix
-        XCTAssertEqual(outStream.bytes.validDescription, verificationFrames)
+        XCTAssertEqual(byteStream.bytes.validDescription, verificationFrames)
     }
 
     /// Test progress bar when writing a tty stream.
@@ -46,10 +47,11 @@ final class ProgressSpinnerTests: XCTestCase {
             XCTFail("Couldn't create pseudo terminal.")
             return
         }
+        let outStream = ThreadSafeOutputByteStream(pty.outStream)
         let spinner = Spinner(kind: Spinner.Kind.allCases.randomElement()!)
         let isShowStopped = Bool.random()
         let headerText = "TestHeader"
-        let progressSpinner = ProgressSpinnerKit.createProgressSpinner(forStream: pty.outStream, header: headerText, isShowStopped: isShowStopped, spinner: spinner)
+        let progressSpinner = ProgressSpinnerKit.createProgressSpinner(forStream: outStream, header: headerText, isShowStopped: isShowStopped, spinner: spinner)
         XCTAssertTrue(progressSpinner is ProgressSpinner)
 
         var output = ""