From 005183c2822e99e6f1950138d32c27bd8d3fcbd5 Mon Sep 17 00:00:00 2001 From: Nick Nallick Date: Mon, 30 Sep 2019 13:50:13 -0600 Subject: [PATCH 1/2] Update SPM to swift-tools-version:5.0 --- Examples/SwiftSerialExample/Package.swift | 16 ++++++++++++++-- Examples/SwiftSerialIM/Package.swift | 16 ++++++++++++++-- Package.swift | 16 +++++++++++++++- README.md | 4 ++-- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Examples/SwiftSerialExample/Package.swift b/Examples/SwiftSerialExample/Package.swift index 6013fde..1e03659 100644 --- a/Examples/SwiftSerialExample/Package.swift +++ b/Examples/SwiftSerialExample/Package.swift @@ -1,8 +1,20 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( name: "SwiftSerialExample", dependencies: [ - .Package(url: "https://github.com/yeokm1/SwiftSerial.git", majorVersion: 0) - ] + .package(url: "https://github.com/yeokm1/SwiftSerial.git", from: "0.1.1") + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "SwiftSerialExample", + dependencies: ["SwiftSerial"], + path: "Sources" + ), + ] ) diff --git a/Examples/SwiftSerialIM/Package.swift b/Examples/SwiftSerialIM/Package.swift index 25947b9..df153f3 100644 --- a/Examples/SwiftSerialIM/Package.swift +++ b/Examples/SwiftSerialIM/Package.swift @@ -1,8 +1,20 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( name: "SwiftSerialIM", dependencies: [ - .Package(url: "https://github.com/yeokm1/SwiftSerial.git", majorVersion: 0) - ] + .package(url: "https://github.com/yeokm1/SwiftSerial.git", from: "0.1.1") + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "SwiftSerialIM", + dependencies: ["SwiftSerial"], + path: "Sources" + ), + ] ) diff --git a/Package.swift b/Package.swift index 3c26705..6490a6d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,19 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( - name: "SwiftSerial" + name: "SwiftSerial", + products: [ + .library(name: "SwiftSerial", targets: ["SwiftSerial"]), + ], + dependencies: [], + targets: [ + .target( + name: "SwiftSerial", + dependencies: [], + path: "Sources" + ), + ] ) diff --git a/README.md b/README.md index ca6d620..4ed1d26 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # SwiftSerial -A Swift Linux and Mac library for reading and writing to serial ports. This library has been tested to work on macOS Sierra, Linux Mint 18 (based on Ubuntu 16.04) and on the [Raspberry Pi 3 on Ubuntu 16.04](https://wiki.ubuntu.com/ARM/RaspberryPi). Other platforms using Ubuntu like the Beaglebone might work as well. +A Swift Linux and Mac library for reading and writing to serial ports. This library has been tested to work on macOS Mojove, Linux Mint 18 (based on Ubuntu 16.04) and on the [Raspberry Pi 3 on Ubuntu 16.04](https://wiki.ubuntu.com/ARM/RaspberryPi) and Raspberry Pi 4 on Raspian Buster. Other platforms using Ubuntu like the Beaglebone might work as well. This library is an improvement over my previous now deprecated library [SwiftLinuxSerial](https://github.com/yeokm1/SwiftLinuxSerial) which was less Swifty and supported only Linux. This library is thanks largely to [Jay Jun](https://github.com/jayjun). His original pull request can be found [here](https://github.com/yeokm1/SwiftLinuxSerial/pull/1). @@ -117,7 +117,7 @@ Add SwiftSerial as a dependency to your project by editing the `Package.swift` f let package = Package( name: "NameOfMyProject", dependencies: [ - .Package(url: "https://github.com/yeokm1/SwiftSerial.git", majorVersion: 0), + .package(url: "https://github.com/yeokm1/SwiftSerial.git", from: "0.1.1"), ... ] ... From 29bbe8505fe6c1e213bfa9b9c81b5bb979812429 Mon Sep 17 00:00:00 2001 From: Nick Nallick Date: Mon, 30 Sep 2019 14:06:53 -0600 Subject: [PATCH 2/2] Update examples to Swift 5 --- Examples/SwiftSerialExample/Sources/main.swift | 6 +++--- Examples/SwiftSerialIM/Sources/main.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/SwiftSerialExample/Sources/main.swift b/Examples/SwiftSerialExample/Sources/main.swift index 402d77c..4ef4103 100644 --- a/Examples/SwiftSerialExample/Sources/main.swift +++ b/Examples/SwiftSerialExample/Sources/main.swift @@ -32,9 +32,9 @@ do { transmitRate: .baud9600, minimumBytesToRead: 1) - print("Writing test string <\(testString)> of \(testString.characters.count) characters to serial port") + print("Writing test string <\(testString)> of \(testString.count) characters to serial port") - var bytesWritten = try serialPort.writeString(testString) + let bytesWritten = try serialPort.writeString(testString) print("Successfully wrote \(bytesWritten) bytes") print("Waiting to receive what was written...") @@ -54,7 +54,7 @@ do { var multiLineString: String = "" - for i in 1...numberOfMultiNewLineTest { + for _ in 1...numberOfMultiNewLineTest { multiLineString += testString + "\n" } diff --git a/Examples/SwiftSerialIM/Sources/main.swift b/Examples/SwiftSerialIM/Sources/main.swift index 4f51cb8..33754f1 100644 --- a/Examples/SwiftSerialIM/Sources/main.swift +++ b/Examples/SwiftSerialIM/Sources/main.swift @@ -113,7 +113,7 @@ do { while true { - var enteredKey = getKeyPress() + let enteredKey = getKeyPress() printToScreenFrom(myself: true, characterToPrint: enteredKey) var _ = try serialPort.writeChar(enteredKey) }