Added SPM support

EmergeTools · Jun 6, 2023 · 1b905a7 · 1b905a7
1 parent c75cd68
commit 1b905a7
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 *.diff
 
 xcuserdata
+.swiftpm
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,25 @@
+// swift-tools-version: 5.8
+import PackageDescription
+
+ let package = Package(
+     name: "Peertalk",
+     products: [
+         .library(name: "Peertalk", targets: ["Peertalk"]),
+     ],
+     targets: [
+         .target(
+             name: "Peertalk",
+             path: "peertalk",
+             exclude: [
+                 "Info.plist",
+                 "PTPrivate.h"
+             ],
+             publicHeadersPath: "public"
+         ),
+         .testTarget(
+             name: "PeertalkTests",
+             dependencies: ["Peertalk"],
+             path: "peertalk-tests"
+         )
+     ]
+ )
diff --git a/peertalk-tests/PTProtocolTests.h b/peertalk-tests/PTProtocolTests.h
@@ -1,7 +1,6 @@
 #import <XCTest/XCTest.h>
 #include <dispatch/dispatch.h>
 #import "PTProtocol.h"
-#import "PTPrivate.h"
 
 @interface PTProtocolTests : XCTestCase {
   dispatch_fd_t socket_[2];

diff --git a/peertalk.xcodeproj/project.pbxproj b/peertalk.xcodeproj/project.pbxproj
@@ -291,14 +291,10 @@
 		6A88FA39150D613800FC3647 /* peertalk */ = {
 			isa = PBXGroup;
 			children = (
-				EE158A7C1CBD402600A3E3F0 /* Peertalk.h */,
-				AB1C5CA8257B96E200F41941 /* PTDefines.h */,
+				F49161CF2A2FAD69004A7415 /* public */,
 				5E2C5023171F46A6008A9752 /* PTPrivate.h */,
-				6ACFD2D4151D36220081ACF5 /* PTChannel.h */,
 				6ACFD2D5151D36220081ACF5 /* PTChannel.m */,
-				6A88FA5C150D61DE00FC3647 /* PTProtocol.h */,
 				6A88FA5D150D61DE00FC3647 /* PTProtocol.m */,
-				6A88FA5E150D61DE00FC3647 /* PTUSBHub.h */,
 				6A88FA5F150D61DE00FC3647 /* PTUSBHub.m */,
 				AB6C99A9257BB91300D5624E /* Info.plist */,
 			);
@@ -347,6 +343,18 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		F49161CF2A2FAD69004A7415 /* public */ = {
+			isa = PBXGroup;
+			children = (
+				EE158A7C1CBD402600A3E3F0 /* Peertalk.h */,
+				AB1C5CA8257B96E200F41941 /* PTDefines.h */,
+				6ACFD2D4151D36220081ACF5 /* PTChannel.h */,
+				6A88FA5C150D61DE00FC3647 /* PTProtocol.h */,
+				6A88FA5E150D61DE00FC3647 /* PTUSBHub.h */,
+			);
+			path = public;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -511,10 +519,9 @@
 			};
 			buildConfigurationList = 6A88FA2A150D613800FC3647 /* Build configuration list for PBXProject "peertalk" */;
 			compatibilityVersion = "Xcode 12.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);

diff --git a/peertalk/PTUSBHub.m b/peertalk/PTUSBHub.m
@@ -1,4 +1,4 @@
-#import "PTUSBHub.h"
+#import "public/PTUSBHub.h"
 #import "PTPrivate.h"
 
 #include <netinet/in.h>

diff --git a/peertalk/PTChannel.h → peertalk/public/PTChannel.h b/peertalk/PTChannel.h → peertalk/public/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;

diff --git a/peertalk/PTDefines.h → peertalk/public/PTDefines.h b/peertalk/PTDefines.h → peertalk/public/PTDefines.h
diff --git a/peertalk/PTProtocol.h → peertalk/public/PTProtocol.h b/peertalk/PTProtocol.h → peertalk/public/PTProtocol.h
diff --git a/peertalk/PTUSBHub.h → peertalk/public/PTUSBHub.h b/peertalk/PTUSBHub.h → peertalk/public/PTUSBHub.h
diff --git a/peertalk/Peertalk.h → peertalk/public/Peertalk.h b/peertalk/Peertalk.h → peertalk/public/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"