Modifying to be carthage friendly.

.gitignore

@@ -42,3 +42,5 @@ docs/
 # Fastlane
 fastlane/report.xml
 fastlane/test_output
+Carthage
+.DS_Store

Cartfile

@@ -0,0 +1,6 @@
+
+github "drekka/Ono" "develop"
+
+github "robbiehanson/CocoaAsyncSocket"
+github "AFNetworking/AFNetworking"
+github "swisspol/GCDWebServer"

Cartfile.resolved

@@ -0,0 +1,4 @@
+github "AFNetworking/AFNetworking" "3.1.0"
+github "robbiehanson/CocoaAsyncSocket" "7.4.3"
+github "swisspol/GCDWebServer" "3.3.2"
+github "drekka/Ono" "67259eb5ed591564149156d88eee38a4669fb183"

CocoaUPnP.xcodeproj/xcshareddata/xcschemes/CocoaUPnP.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+               BuildableName = "CocoaUPnP.framework"
+               BlueprintName = "CocoaUPnP"
+               ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+            BuildableName = "CocoaUPnP.framework"
+            BlueprintName = "CocoaUPnP"
+            ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+            BuildableName = "CocoaUPnP.framework"
+            BlueprintName = "CocoaUPnP"
+            ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CocoaUPnP/CocoaUPnP.h

@@ -3,6 +3,12 @@
 
 #import <Foundation/Foundation.h>
 
+//! Project version number for CocoaUPnP.
+FOUNDATION_EXPORT double CocoaUPnPVersionNumber;
+
+//! Project version string for CocoaUPnP.
+FOUNDATION_EXPORT const unsigned char CocoaUPnPVersionString[];
+
 // Events
 #import "UPPEventServer.h"
 #import "UPPEventSubscription.h"
@@ -35,7 +41,7 @@
 #import "UPPBaseParser.h"
 #import "UPPDeviceParser.h"
 #import "UPPErrorParser.h"
-#import "UPPLastChangeParser.h"
+//#import "UPPLastChangeParser.h"
 #import "UPPMediaItemParser.h"
 #import "UPPResponseParser.h"
 

CocoaUPnP/Events/UPPEventServer.h

@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import <Foundation/Foundation.h>
-#import <GCDWebServer/GCDWebServer.h>
+#import <GCDWebServers/GCDWebServer.h>
 
 /**
  A delegate protocol for recieving parsed UPnP events.

CocoaUPnP/Events/UPPEventServer.m

@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPEventServer.h"
-#import "GCDWebServerDataRequest.h"
+#import <GCDWebServers/GCDWebServers.h>
 #import "UPPLastChangeParser.h"
 
 const NSUInteger UPPEventServerPort = 54123;

CocoaUPnP/Events/UPPEventSubscriptionManager.m

@@ -1,6 +1,8 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+@import UIKit;
+
 #import "UPPEventSubscriptionManager.h"
 #import "UPPBasicService.h"
 #import "UPPEventSubscription.h"

CocoaUPnP/Models/UPPConstants.m

@@ -1,6 +1,8 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+@import Foundation;
+
 #import "UPPConstants.h"
 
 NSString * const UPPSOAPActionKey = @"SoapAction";

CocoaUPnP/Networking/SSDP/SSDPServiceBrowser.m

@@ -22,9 +22,11 @@
 //  Expanded for CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 //  Copyright 2015 Arcam. See LICENSE file.
 
+@import UIKit;
+
 #import "SSDPServiceBrowser.h"
 
-#import "GCDAsyncUdpSocket.h"
+#import <CocoaAsyncSocket/CocoaAsyncSocket.h>
 #import "SSDPService.h"
 
 #import <ifaddrs.h>
@@ -139,8 +141,8 @@ - (GCDAsyncUdpSocket *)unicastSocket
 {
     if (!_unicastSocket) {
         _unicastSocket = [[GCDAsyncUdpSocket alloc]
-                            initWithDelegate:self
-                            delegateQueue:dispatch_get_main_queue()];
+                          initWithDelegate:self
+                          delegateQueue:dispatch_get_main_queue()];
     }
     return _unicastSocket;
 }

CocoaUPnP/Parsers/UPPDeviceParser.m

@@ -1,13 +1,14 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+#import <Ono/Ono.h>
+#import <AFNetworking/AFNetworking.h>
+
 #import "UPPDeviceParser.h"
 #import "UPPBasicDevice.h"
-#import "Ono.h"
 #import "UPPDeviceIcon.h"
 #import "UPPServiceDescription.h"
 #import "UPPError.h"
-#import "AFHTTPSessionManager.h"
 #import "UPPRequestSerializer.h"
 #import "UPPMediaRendererDevice.h"
 #import "UPPMediaServerDevice.h"

CocoaUPnP/Parsers/UPPErrorParser.m

@@ -3,7 +3,7 @@
 
 #import "UPPErrorParser.h"
 #import "UPPError.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 
 @implementation UPPErrorParser
 

CocoaUPnP/Parsers/UPPLastChangeParser.m

@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPLastChangeParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPError.h"
 #import "UPPMediaItemParser.h"
 
@@ -50,7 +50,7 @@ + (void)parseData:(NSData *)data completion:(void (^)(NSDictionary *event, NSErr
             if (value.length == 0) {
                 value = [element stringValue];
             }
-            
+
             if (tag && value) {
                 responseDictionary[tag] = value;
             }

CocoaUPnP/Parsers/UPPMediaItemParser.m

@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPMediaItemParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPMediaItem.h"
 #import "UPPMediaItemResource.h"
 #import "UPPError.h"

CocoaUPnP/Parsers/UPPResponseParser.m

@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPResponseParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPError.h"
 #import "UPPMediaItemParser.h"
 

Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

README.md

@@ -1,5 +1,6 @@
 # CocoaUPnP
 
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Build Status](https://travis-ci.org/arcam/CocoaUPnP.svg)](https://travis-ci.org/arcam/CocoaUPnP)
 [![Coverage Status](https://coveralls.io/repos/arcam/CocoaUPnP/badge.svg)](https://coveralls.io/r/arcam/CocoaUPnP)
 [![Pod Version](https://img.shields.io/cocoapods/v/CocoaUPnP.svg)](http://cocoadocs.org/docsets/CocoaUPnP/)

module.modulemap

@@ -0,0 +1,4 @@
+module CocoaUPnP {
+    umbrella header "Headers/CocoaUPnP.h"
+    requires objc_arc
+}

module.private.modulemap

@@ -0,0 +1,4 @@
+explicit module CocoaUPnP.Private {
+    umbrella "PrivateHeaders"
+    requires objc_arc
+}