From 641a4502793522a838093f6644bc47f47f58bd89 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Fri, 25 Jan 2019 12:02:54 -0500
Subject: [PATCH] Add modulemap for libmpdclient

---
 Persephone.xcodeproj/project.pbxproj    | 16 ++++++++++------
 Persephone/Persephone-Bridging-Header.h |  1 -
 Persephone/ViewController.swift         |  5 +----
 Persephone/module.modulemap             |  4 ++++
 4 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 Persephone/Persephone-Bridging-Header.h
 create mode 100644 Persephone/module.modulemap

diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj
index 62ccf42..a43577f 100644
--- a/Persephone.xcodeproj/project.pbxproj
+++ b/Persephone.xcodeproj/project.pbxproj
@@ -64,7 +64,7 @@
 		E40786392110CE70006887B1 /* PersephoneUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersephoneUITests.swift; sourceTree = "<group>"; };
 		E407863B2110CE70006887B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E41B22BF21FB6BBA00D544F6 /* libmpdclient.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpdclient.2.dylib; path = libmpdclient/output/libmpdclient.2.dylib; sourceTree = "<group>"; };
-		E41B22C321FB6EFA00D544F6 /* Persephone-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Persephone-Bridging-Header.h"; sourceTree = "<group>"; };
+		E41B22C421FB715A00D544F6 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		E465049921E94DF500A70F4C /* WindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -123,9 +123,9 @@
 				E407861F2110CE70006887B1 /* Assets.xcassets */,
 				E40786212110CE70006887B1 /* Main.storyboard */,
 				E465049921E94DF500A70F4C /* WindowController.swift */,
-				E41B22C321FB6EFA00D544F6 /* Persephone-Bridging-Header.h */,
 				E40786242110CE70006887B1 /* Info.plist */,
 				E40786252110CE70006887B1 /* Persephone.entitlements */,
+				E41B22C421FB715A00D544F6 /* module.modulemap */,
 			);
 			path = Persephone;
 			sourceTree = "<group>";
@@ -457,7 +457,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = BDEE7ZBFZ3;
-				HEADER_SEARCH_PATHS = libmpdclient/include;
 				INFOPLIST_FILE = Persephone/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -469,8 +468,11 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Persephone/Persephone-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
+				SYSTEM_HEADER_SEARCH_PATHS = (
+					libmpdclient/include,
+					Persephone,
+				);
 				USER_HEADER_SEARCH_PATHS = libmpdclient/output;
 			};
 			name = Debug;
@@ -483,7 +485,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = BDEE7ZBFZ3;
-				HEADER_SEARCH_PATHS = libmpdclient/include;
 				INFOPLIST_FILE = Persephone/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -495,8 +496,11 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = me.danbarber.Persephone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Persephone/Persephone-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
+				SYSTEM_HEADER_SEARCH_PATHS = (
+					libmpdclient/include,
+					Persephone,
+				);
 				USER_HEADER_SEARCH_PATHS = libmpdclient/output;
 			};
 			name = Release;
diff --git a/Persephone/Persephone-Bridging-Header.h b/Persephone/Persephone-Bridging-Header.h
deleted file mode 100644
index a315cce..0000000
--- a/Persephone/Persephone-Bridging-Header.h
+++ /dev/null
@@ -1 +0,0 @@
-#import <mpd/client.h>
diff --git a/Persephone/ViewController.swift b/Persephone/ViewController.swift
index 8791d05..ee033d8 100644
--- a/Persephone/ViewController.swift
+++ b/Persephone/ViewController.swift
@@ -7,9 +7,9 @@
 //
 
 import Cocoa
+import mpdclient
 
 class ViewController: NSViewController {
-
   override func viewDidLoad() {
     super.viewDidLoad()
 
@@ -21,7 +21,4 @@ class ViewController: NSViewController {
     // Update the view, if already loaded.
     }
   }
-
-
 }
-
diff --git a/Persephone/module.modulemap b/Persephone/module.modulemap
new file mode 100644
index 0000000..1bcf28c
--- /dev/null
+++ b/Persephone/module.modulemap
@@ -0,0 +1,4 @@
+module mpdclient [system] {
+  umbrella "mpd"
+  export *
+}