Merge pull request #31 from swiftty/spm

Support Swift Package Manager
gabriel · Jul 10, 2021 · b4a8d81 · b4a8d81
2 parents 9bd6e63 + 641df63
commit b4a8d81
Show file tree

Hide file tree

Showing 37 changed files with 315 additions and 158 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,17 @@ Pods
 Cartfile.resolved
 Carthage
 build
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+.swiftpm
+
+.build/
diff --git a/MPMessagePack.podspec b/MPMessagePack.podspec
@@ -12,12 +12,14 @@ Pod::Spec.new do |s|
   s.dependency "GHODictionary"
 
   s.ios.deployment_target = "6.0"
-  s.ios.source_files = "MPMessagePack/**/*.{c,h,m}", "RPC/**/*.{c,h,m}"
+  s.ios.source_files = "MPMessagePack/**/*.{c,h,m}"
+  s.ios.exclude_files = "MPMessagePack/XPC/**/*.{c,h,m}", "MPMessagePack/include/XPC/**/*.{c,h,m}"
 
   s.tvos.deployment_target = "10.0"
-  s.tvos.source_files = "MPMessagePack/**/*.{c,h,m}", "RPC/**/*.{c,h,m}"
+  s.tvos.source_files = "MPMessagePack/**/*.{c,h,m}"
+  s.tvos.exclude_files = "MPMessagePack/XPC/**/*.{c,h,m}", "MPMessagePack/include/XPC/**/*.{c,h,m}"
 
   s.osx.deployment_target = "10.8"
-  s.osx.source_files = "MPMessagePack/**/*.{c,h,m}", "RPC/**/*.{c,h,m}", "XPC/**/*.{c,h,m}"
+  s.osx.source_files = "MPMessagePack/**/*.{c,h,m}"
 
 end
diff --git a/MPMessagePack.xcodeproj/project.pbxproj b/MPMessagePack.xcodeproj/project.pbxproj
diff --git a/MPMessagePack/MPMessagePackReader.m b/MPMessagePack/MPMessagePackReader.m
@@ -11,7 +11,11 @@
 #include "cmp.h"
 #import "MPDefines.h"
 
+#if SWIFT_PACKAGE
+@import GHODictionary;
+#else
 #import <GHODictionary/GHODictionary.h>
+#endif
 
 @interface MPMessagePackReader ()
 @property NSData *data;

diff --git a/MPMessagePack/MPMessagePackWriter.m b/MPMessagePack/MPMessagePackWriter.m
@@ -10,7 +10,12 @@
 
 #include "cmp.h"
 
+#if SWIFT_PACKAGE
+@import GHODictionary;
+#else
 #import <GHODictionary/GHODictionary.h>
+#endif
+
 #import "MPDefines.h"
 
 @interface MPMessagePackWriter ()

diff --git a/MPMessagePack/NSData+MPMessagePack.m b/MPMessagePack/NSData+MPMessagePack.m
@@ -8,7 +8,11 @@
 
 #import "NSData+MPMessagePack.h"
 
+#if SWIFT_PACKAGE
+@import GHODictionary;
+#else
 #import <GHODictionary/GHODictionary.h>
+#endif
 
 @implementation NSData (MPMessagePack)
 

diff --git a/RPC/MPDispatchRequest.m → MPMessagePack/RPC/MPDispatchRequest.m b/RPC/MPDispatchRequest.m → MPMessagePack/RPC/MPDispatchRequest.m
diff --git a/RPC/MPMessagePackClient.m → MPMessagePack/RPC/MPMessagePackClient.m b/RPC/MPMessagePackClient.m → MPMessagePack/RPC/MPMessagePackClient.m
@@ -8,7 +8,6 @@
 
 #import "MPMessagePackClient.h"
 
-#import "MPMessagePack.h"
 #import "MPRequestor.h"
 #import "MPDispatchRequest.h"
 #include <sys/socket.h>

diff --git a/RPC/MPMessagePackServer.m → MPMessagePack/RPC/MPMessagePackServer.m b/RPC/MPMessagePackServer.m → MPMessagePack/RPC/MPMessagePackServer.m
diff --git a/RPC/MPRPCProtocol.m → MPMessagePack/RPC/MPRPCProtocol.m b/RPC/MPRPCProtocol.m → MPMessagePack/RPC/MPRPCProtocol.m
diff --git a/RPC/MPRequestor.m → MPMessagePack/RPC/MPRequestor.m b/RPC/MPRequestor.m → MPMessagePack/RPC/MPRequestor.m
diff --git a/XPC/MPXPCClient.m → MPMessagePack/XPC/MPXPCClient.m b/XPC/MPXPCClient.m → MPMessagePack/XPC/MPXPCClient.m
@@ -7,6 +7,9 @@
 //
 
 #import "MPXPCClient.h"
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 
 #import "MPDefines.h"
 #import "NSArray+MPMessagePack.h"
@@ -187,3 +190,5 @@ - (void)_sendRequest:(NSString *)method params:(NSArray *)params attempt:(NSInte
 }
 
 @end
+
+#endif
diff --git a/XPC/MPXPCProtocol.m → MPMessagePack/XPC/MPXPCProtocol.m b/XPC/MPXPCProtocol.m → MPMessagePack/XPC/MPXPCProtocol.m
@@ -7,6 +7,9 @@
 //
 
 #import "MPXPCProtocol.h"
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 
 #import "NSArray+MPMessagePack.h"
 #import "NSData+MPMessagePack.h"
@@ -55,3 +58,5 @@ + (void)requestFromXPCObject:(xpc_object_t)event completion:(void (^)(NSError *e
 }
 
 @end
+
+#endif
diff --git a/XPC/MPXPCService.m → MPMessagePack/XPC/MPXPCService.m b/XPC/MPXPCService.m → MPMessagePack/XPC/MPXPCService.m
@@ -7,6 +7,9 @@
 //
 
 #import "MPXPCService.h"
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 
 #import "NSData+MPMessagePack.h"
 #import "NSArray+MPMessagePack.h"
@@ -181,3 +184,5 @@ - (BOOL)checkCodeRequirement:(NSString *)codeRequirement pid:(pid_t)pid error:(N
 }
 
 @end
+
+#endif
diff --git a/MPMessagePack/MPDefines.h → MPMessagePack/include/MPDefines.h b/MPMessagePack/MPDefines.h → MPMessagePack/include/MPDefines.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Gabriel Handford. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
+
 #undef MPDebug
 #define MPDebug(fmt, ...) do {} while(0)
 #undef MPErr

diff --git a/MPMessagePack/MPLog.h → MPMessagePack/include/MPLog.h b/MPMessagePack/MPLog.h → MPMessagePack/include/MPLog.h
diff --git a/MPMessagePack/MPMessagePackReader.h → MPMessagePack/include/MPMessagePackReader.h b/MPMessagePack/MPMessagePackReader.h → MPMessagePack/include/MPMessagePackReader.h
diff --git a/MPMessagePack/MPMessagePackWriter.h → MPMessagePack/include/MPMessagePackWriter.h b/MPMessagePack/MPMessagePackWriter.h → MPMessagePack/include/MPMessagePackWriter.h
diff --git a/MPMessagePack/NSArray+MPMessagePack.h → ...ssagePack/include/NSArray+MPMessagePack.h b/MPMessagePack/NSArray+MPMessagePack.h → ...ssagePack/include/NSArray+MPMessagePack.h
diff --git a/MPMessagePack/NSData+MPMessagePack.h → MPMessagePack/include/NSData+MPMessagePack.h b/MPMessagePack/NSData+MPMessagePack.h → MPMessagePack/include/NSData+MPMessagePack.h
diff --git a/MPMessagePack/NSDictionary+MPMessagePack.h → ...Pack/include/NSDictionary+MPMessagePack.h b/MPMessagePack/NSDictionary+MPMessagePack.h → ...Pack/include/NSDictionary+MPMessagePack.h
diff --git a/RPC/MPDispatchRequest.h → ...ssagePack/include/RPC/MPDispatchRequest.h b/RPC/MPDispatchRequest.h → ...ssagePack/include/RPC/MPDispatchRequest.h
diff --git a/RPC/MPMessagePackClient.h → ...agePack/include/RPC/MPMessagePackClient.h b/RPC/MPMessagePackClient.h → ...agePack/include/RPC/MPMessagePackClient.h
diff --git a/RPC/MPMessagePackServer.h → ...agePack/include/RPC/MPMessagePackServer.h b/RPC/MPMessagePackServer.h → ...agePack/include/RPC/MPMessagePackServer.h
@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "MPMessagePack.h"
 #import "MPMessagePackClient.h"
 
 @interface MPMessagePackServer : NSObject <MPMessagePackClientDelegate>

diff --git a/RPC/MPRPCProtocol.h → MPMessagePack/include/RPC/MPRPCProtocol.h b/RPC/MPRPCProtocol.h → MPMessagePack/include/RPC/MPRPCProtocol.h
diff --git a/RPC/MPRequestor.h → MPMessagePack/include/RPC/MPRequestor.h b/RPC/MPRequestor.h → MPMessagePack/include/RPC/MPRequestor.h
diff --git a/MPMessagePack/include/XPC/MPXDefines.h b/MPMessagePack/include/XPC/MPXDefines.h
@@ -0,0 +1,14 @@
+//
+//  MPXDefines.h
+//  MPMessagePack
+//
+//  Copyright (c) 2014 Gabriel Handford. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
+#define ENABLE_XPC_SUPPORT 1
+#else
+#define ENABLE_XPC_SUPPORT 0
+#endif
diff --git a/XPC/MPXPCClient.h → MPMessagePack/include/XPC/MPXPCClient.h b/XPC/MPXPCClient.h → MPMessagePack/include/XPC/MPXPCClient.h
@@ -7,6 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 
 #import "MPMessagePackReader.h"
 #import "MPLog.h"
@@ -31,3 +34,5 @@
 - (void)close;
 
 @end
+
+#endif
diff --git a/XPC/MPXPCProtocol.h → MPMessagePack/include/XPC/MPXPCProtocol.h b/XPC/MPXPCProtocol.h → MPMessagePack/include/XPC/MPXPCProtocol.h
@@ -7,6 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 #import <xpc/xpc.h>
 
 typedef NS_ENUM(NSInteger, MPXPCErrorCode) {
@@ -25,3 +28,5 @@ typedef NS_ENUM(NSInteger, MPXPCErrorCode) {
 + (void)requestFromXPCObject:(xpc_object_t)event completion:(void (^)(NSError *error, NSNumber *messageId, NSString *method, NSArray *params))completion;
 
 @end
+
+#endif
diff --git a/XPC/MPXPCService.h → MPMessagePack/include/XPC/MPXPCService.h b/XPC/MPXPCService.h → MPMessagePack/include/XPC/MPXPCService.h
@@ -7,6 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MPXDefines.h"
+
+#if ENABLE_XPC_SUPPORT
 #import <ServiceManagement/ServiceManagement.h>
 #import <xpc/xpc.h>
 
@@ -20,3 +23,5 @@
 - (void)handleRequestWithMethod:(NSString *)method params:(NSArray *)params messageId:(NSNumber *)messageId remote:(xpc_connection_t)remote completion:(void (^)(NSError *error, id value))completion;
 
 @end
+
+#endif
diff --git a/MPMessagePack/cmp.h → MPMessagePack/include/cmp.h b/MPMessagePack/cmp.h → MPMessagePack/include/cmp.h
diff --git a/MPMessagePackTests/MPMessagePackClientTest.m b/MPMessagePackTests/MPMessagePackClientTest.m
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTestCase.h>
 
-#import <MPMessagePack/MPMessagePack.h>
+@import MPMessagePack;
 
 @interface MPMessagePackClientTest : XCTestCase
 @property MPMessagePackClient *client;
@@ -151,4 +151,4 @@ - (void)testClientServer {
 //  [self waitForExpectationsWithTimeout:1.0 handler:nil];
 //}
 
-@end
+@end
diff --git a/MPMessagePackTests/MPMessagePackTest.m b/MPMessagePackTests/MPMessagePackTest.m
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <MPMessagePack/MPMessagePack.h>
+@import MPMessagePack;
 
 @interface MPMessagePackTest : XCTestCase
 @end

diff --git a/MPMessagePackTests/MPRPCProtocolTest.m b/MPMessagePackTests/MPRPCProtocolTest.m
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <MPMessagePack/MPMessagePack.h>
+@import MPMessagePack;
 
 @interface MPRPCProtocolTest : XCTestCase
 @end

diff --git a/MPMessagePackTests/MPXPCTest.m b/MPMessagePackTests/MPXPCTest.m
@@ -9,7 +9,9 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <MPMessagePack/MPMessagePack.h>
+#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
+
+@import MPMessagePack;
 
 @interface MPXPCTest : XCTestCase
 @end
@@ -58,3 +60,4 @@ - (void)testInvalidConnection {
 
 @end
 
+#endif
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "GHODictionary",
+        "repositoryURL": "https://github.com/gabriel/GHODictionary",
+        "state": {
+          "branch": "master",
+          "revision": "a67b9df6dfc6e6af3910d104fd9900e15dc15de9",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,36 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "MPMessagePack",
+    platforms: [
+        .iOS(.v8), .tvOS(.v10), .macOS(.v10_10)
+    ],
+    products: [
+        .library(
+            name: "MPMessagePack",
+            targets: ["MPMessagePack"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/gabriel/GHODictionary", .branch("master"))
+    ],
+    targets: [
+        .target(
+            name: "MPMessagePack",
+            dependencies: ["GHODictionary"],
+            path: "MPMessagePack",
+            exclude: ["MPMessagePack.h"],
+            cSettings: [
+                .headerSearchPath("include"),
+                .headerSearchPath("include/RPC"),
+                .headerSearchPath("include/XPC"),
+            ]),
+        .testTarget(
+            name: "MPMessagePackTests",
+            dependencies: ["MPMessagePack"],
+            path: "MPMessagePackTests",
+            exclude: ["Info.plist"]),
+    ]
+)