Enable swift package manager

.github/workflows/build.yml

@@ -0,0 +1,19 @@
+name: Swift
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

.gitignore

@@ -13,3 +13,17 @@
 *.diff
 
 xcuserdata
+
+# Created by https://www.toptal.com/developers/gitignore/api/swiftpm
+# Edit at https://www.toptal.com/developers/gitignore?templates=swiftpm
+
+### SwiftPM ###
+Packages
+.build/
+xcuserdata
+DerivedData/
+*.xcodeproj
+
+
+# End of https://www.toptal.com/developers/gitignore/api/swiftpm
+.swiftpm

Package.swift

@@ -0,0 +1,59 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import PackageDescription
+
+let package = Package(
+    name: "Peertalk",
+    platforms: [
+        .macOS(.v10_15),
+        .iOS(.v14)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "Peertalk",
+            targets: ["Peertalk"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    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 this package depends on.
+        .target(
+            name: "Peertalk",
+            dependencies: [],
+            exclude: [
+                "Info.plist"
+            ],
+            publicHeadersPath: ""),
+        .testTarget(
+            name: "PeertalkTests",
+            dependencies: ["Peertalk"],
+            exclude: [
+                "Info.plist"
+            ]
+        )
+    ]
+)

PeerTalk.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
     spec.summary  = 'iOS and OS X Cocoa library for communicating over USB and TCP.'
 
     spec.source   = { :git => "https://github.com/rsms/PeerTalk.git", :tag => '0.1.0' }
-    spec.source_files = 'peertalk/*.{h,m}'
+    spec.source_files = 'Sources/peertalk/*.{h,m}'
     spec.ios.deployment_target = '14.0'
     spec.osx.deployment_target = '11.0'
 

peertalk/PTChannel.m → Sources/peertalk/PTChannel.m

@@ -1,5 +1,5 @@
-#import "PTChannel.h"
-#import "PTPrivate.h"
+#import "include/PTChannel.h"
+#import "include/PTPrivate.h"
 
 #include <sys/ioctl.h>
 #include <sys/un.h>

peertalk/PTProtocol.m → Sources/peertalk/PTProtocol.m

@@ -1,5 +1,5 @@
-#import "PTProtocol.h"
-#import "PTPrivate.h"
+#import "include/PTProtocol.h"
+#import "include/PTPrivate.h"
 #import <objc/runtime.h>
 
 static const uint32_t PTProtocolVersion1 = 1;

peertalk/PTUSBHub.m → Sources/peertalk/PTUSBHub.m

@@ -1,5 +1,5 @@
-#import "PTUSBHub.h"
-#import "PTPrivate.h"
+#import "include/PTUSBHub.h"
+#import "include/PTPrivate.h"
 
 #include <netinet/in.h>
 #include <sys/socket.h>

peertalk/PTChannel.h → Sources/peertalk/include/PTChannel.h

@@ -7,9 +7,9 @@
 #import <netinet/in.h>
 #import <sys/socket.h>
 
-#import <peertalk/PTProtocol.h>
-#import <peertalk/PTUSBHub.h>
-#import <peertalk/PTDefines.h>
+#import "PTProtocol.h"
+#import "PTUSBHub.h"
+#import "PTDefines.h"
 
 @class PTAddress;
 @protocol PTChannelDelegate;

peertalk/Peertalk.h → Sources/peertalk/include/Peertalk.h

@@ -6,7 +6,7 @@ FOUNDATION_EXPORT double PeertalkVersionNumber;
 //! Project version string for Peertalk.
 FOUNDATION_EXPORT const unsigned char PeertalkVersionString[];
 
-#import <peertalk/PTChannel.h>
-#import <peertalk/PTDefines.h>
-#import <peertalk/PTProtocol.h>
-#import <peertalk/PTUSBHub.h>
+#import "PTChannel.h"
+#import "PTDefines.h"
+#import "PTProtocol.h"
+#import "PTUSBHub.h"

peertalk-tests/PTProtocolTests.h → Tests/PeertalkTests/PTProtocolTests.h

@@ -1,7 +1,8 @@
 #import <XCTest/XCTest.h>
 #include <dispatch/dispatch.h>
-#import "PTProtocol.h"
-#import "PTPrivate.h"
+
+#import "include/PTProtocol.h"
+#import "include/PTPrivate.h"
 
 @interface PTProtocolTests : XCTestCase {
   dispatch_fd_t socket_[2];