Fix iOS SPM include files

Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "CocoaAsyncSocket",
+        "repositoryURL": "https://github.com/ricobeck/CocoaAsyncSocket.git",
+        "state": {
+          "branch": null,
+          "revision": "9b2cfedabfa421523e5edd9f2409999ba567a427",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(

iOS/Bagel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "cocoaasyncsocket",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/robbiehanson/CocoaAsyncSocket",
+      "state" : {
+        "revision" : "dbdc00669c1ced63b27c3c5f052ee4d28f10150c",
+        "version" : "7.6.5"
+      }
+    }
+  ],
+  "version" : 2
+}

iOS/Source/BagelUtility.m

@@ -21,6 +21,10 @@
 
 #import "BagelUtility.h"
 
+#if TARGET_OS_IPHONE
+@import UIKit;
+#endif
+
 @implementation BagelUtility
 
 + (NSString*)UUID
@@ -40,20 +44,21 @@ + (NSString*)deviceId
 
 + (NSString*)deviceName
 {
-    return [UIDevice currentDevice].name;
+    #if TARGET_OS_IPHONE
+    return [[UIDevice currentDevice] name];
+    #elif TARGET_OS_MAC
+    return [[NSHost currentHost] localizedName];
+    #endif
 }
 
 + (NSString*)deviceDescription
 {
-    NSString* information = @"";
-
-    information = [UIDevice currentDevice].model;
-    information = [NSString stringWithFormat:@"%@ %@", information, [UIDevice currentDevice].systemName];
-    information = [NSString stringWithFormat:@"%@ %@", information, [UIDevice currentDevice].systemVersion];
-
-    return information;
+    #if TARGET_OS_IPHONE
+    return [NSString stringWithFormat: @"%@ %@ %@", [UIDevice currentDevice].systemName, [UIDevice currentDevice].systemName, [UIDevice currentDevice].systemVersion];
+    #elif TARGET_OS_MAC
+    NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+    return [NSString stringWithFormat: @"%@ %ld.%ld.%ld", [[NSHost currentHost] localizedName], version.majorVersion, version.minorVersion, version.patchVersion];
+    #endif
 }
 
 @end
-
-

iOS/Source/Bagel.h → iOS/Source/include/Bagel.h

@@ -19,22 +19,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <UIKit/UIKit.h>
-
-//! Project version number for Bagel.
-FOUNDATION_EXPORT double BagelVersionNumber;
-
-//! Project version string for Bagel.
-FOUNDATION_EXPORT const unsigned char BagelVersionString[];
-
 #import <Foundation/Foundation.h>
 
-#import <Bagel/BagelBaseModel.h>
-#import <Bagel/BagelCarrierDelegate.h>
-#import <Bagel/BagelConfiguration.h>
-#import <Bagel/BagelDeviceModel.h>
-#import <Bagel/BagelProjectModel.h>
-#import <Bagel/BagelUtility.h>
+#import "BagelBaseModel.h"
+#import "BagelCarrierDelegate.h"
+#import "BagelConfiguration.h"
+#import "BagelDeviceModel.h"
+#import "BagelProjectModel.h"
+#import "BagelUtility.h"
 
 @interface Bagel : NSObject
 

iOS/Source/BagelUtility.h → iOS/Source/include/BagelUtility.h

@@ -20,7 +20,6 @@
 // THE SOFTWARE.
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @interface BagelUtility : NSObject
 

mac/Podfile.lock

@@ -20,5 +20,4 @@ SPEC CHECKSUMS:
   macOSThemeKit: 651af12838675beac5547687226a270c294f8f84
 
 PODFILE CHECKSUM: 6e39cacd4a77b09b958e2e6f8b405bbc2340dfc2
-
-COCOAPODS: 1.8.4
+COCOAPODS: 1.11.3