浏览代码

Merge pull request #14 from nallick/swift-tools-version-5

Update SPM to swift-tools-version:5.0
Yeo Kheng Meng 6 年之前
父节点
当前提交
86625ee414

+ 14 - 2
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
 import PackageDescription
 
 
 let package = Package(
 let package = Package(
     name: "SwiftSerialExample",
     name: "SwiftSerialExample",
     dependencies: [
     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"
+        ),
+    ]
 )
 )

+ 3 - 3
Examples/SwiftSerialExample/Sources/main.swift

@@ -32,9 +32,9 @@ do {
                            transmitRate: .baud9600,
                            transmitRate: .baud9600,
                            minimumBytesToRead: 1)
                            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("Successfully wrote \(bytesWritten) bytes")
     print("Waiting to receive what was written...")
     print("Waiting to receive what was written...")
@@ -54,7 +54,7 @@ do {
     var multiLineString: String = ""
     var multiLineString: String = ""
 
 
 
 
-    for i in 1...numberOfMultiNewLineTest { 
+    for _ in 1...numberOfMultiNewLineTest { 
         multiLineString += testString + "\n"
         multiLineString += testString + "\n"
     }
     }
 
 

+ 14 - 2
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
 import PackageDescription
 
 
 let package = Package(
 let package = Package(
     name: "SwiftSerialIM",
     name: "SwiftSerialIM",
     dependencies: [
     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"
+        ),
+    ]
 )
 )

+ 1 - 1
Examples/SwiftSerialIM/Sources/main.swift

@@ -113,7 +113,7 @@ do {
 
 
 
 
     while true {
     while true {
-        var enteredKey = getKeyPress()
+        let enteredKey = getKeyPress()
         printToScreenFrom(myself: true, characterToPrint: enteredKey)
         printToScreenFrom(myself: true, characterToPrint: enteredKey)
         var _ = try serialPort.writeChar(enteredKey)
         var _ = try serialPort.writeChar(enteredKey)
     }
     }

+ 15 - 1
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
 import PackageDescription
 
 
 let package = Package(
 let package = Package(
-    name: "SwiftSerial"
+    name: "SwiftSerial",
+	products: [
+		.library(name: "SwiftSerial", targets: ["SwiftSerial"]),
+	],
+	dependencies: [],
+	targets: [
+		.target(
+			name: "SwiftSerial",
+			dependencies: [],
+			path: "Sources"
+		),
+	]
 )
 )

+ 2 - 2
README.md

@@ -1,5 +1,5 @@
 # SwiftSerial
 # 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).
 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(
 let package = Package(
     name: "NameOfMyProject",
     name: "NameOfMyProject",
     dependencies: [
     dependencies: [
-        .Package(url: "https://github.com/yeokm1/SwiftSerial.git", majorVersion: 0),
+        .package(url: "https://github.com/yeokm1/SwiftSerial.git", from: "0.1.1"),
         ...
         ...
     ]
     ]
     ...
     ...