From dadd5243dcb61b1a48f7272fc4aac210f834e87a Mon Sep 17 00:00:00 2001
From: Robert Dougan <robert@dougan.me>
Date: Wed, 7 Oct 2015 20:23:47 +0200
Subject: [PATCH 01/10] add podspec

---
 XUIKit.podspec | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 XUIKit.podspec

diff --git a/XUIKit.podspec b/XUIKit.podspec
new file mode 100644
index 0000000..6f6ccd6
--- /dev/null
+++ b/XUIKit.podspec
@@ -0,0 +1,21 @@
+Pod::Spec.new do |s|
+  s.name         = "XUIKit"
+  s.version      = "1.0.0"
+  s.summary      = "XUIKit uses categories to make NSBezierPath, NSColor, NSFont completely API compatible with their UIKit counterparts."
+
+  s.description  = <<-DESC
+                   XUIKit uses categories to make NSBezierPath, NSColor, NSFont completely API compatible with their UIKit counterparts.
+                   DESC
+
+  s.homepage     = "https://github.com/iccir/XUIKit"
+  s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.author             = { "Ricci Adams" => "leonard@hecker.io" }
+
+  s.platform     = :osx
+  s.source       = { :git => "https://github.com/iccir/XUIKit.git", :tag => "1.0.0" }
+
+  s.source_files  = "Source/*.{h,m}"
+  s.public_header_files = "Source/*.h"
+
+  s.requires_arc = true
+end

From 389acfa7f6a9de4ade75fc92fbeaece3913e39f1 Mon Sep 17 00:00:00 2001
From: David Hedbor <david@ookla.com>
Date: Thu, 5 Nov 2015 14:46:52 -0800
Subject: [PATCH 02/10] Changes to make XUIKit work properly as a
 framework/module with Swift

---
 Source/XUIBezierPathAdditions.h  |  2 +-
 Source/XUIKit.h                  |  1 +
 XUIKit.xcodeproj/project.pbxproj | 29 ++++++++++++++++-------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Source/XUIBezierPathAdditions.h b/Source/XUIBezierPathAdditions.h
index 0d37d04..c4ebdbd 100644
--- a/Source/XUIBezierPathAdditions.h
+++ b/Source/XUIBezierPathAdditions.h
@@ -31,7 +31,7 @@
 - (void) addLineToPoint:(CGPoint)point;
 - (void) addCurveToPoint:(CGPoint)endPoint controlPoint1:(CGPoint)controlPoint1 controlPoint2:(CGPoint)controlPoint2;
 - (void) addQuadCurveToPoint:(CGPoint)endPoint controlPoint:(CGPoint)controlPoint;
-- (void) addArcWithCenter:(CGPoint)center radius:(CGFloat)radius startAngle:(CGFloat)startAngle endAngle:(CGFloat)endAngle clockwise:(BOOL)clockwise __OSX_AVAILABLE_STARTING(__MAC_NA,__IPHONE_4_0);
+- (void) addArcWithCenter:(CGPoint)center radius:(CGFloat)radius startAngle:(CGFloat)startAngle endAngle:(CGFloat)endAngle clockwise:(BOOL)clockwise;
 
 - (void) appendPath:(NSBezierPath *)bezierPath;
 - (void) applyTransform:(CGAffineTransform)transform;
diff --git a/Source/XUIKit.h b/Source/XUIKit.h
index 8fbbcec..3ca9b7a 100644
--- a/Source/XUIKit.h
+++ b/Source/XUIKit.h
@@ -20,6 +20,7 @@
 */
 
 #import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
 
 #import <XUIKit/XUIBase.h>
 #import <XUIKit/XUITypes.h>
diff --git a/XUIKit.xcodeproj/project.pbxproj b/XUIKit.xcodeproj/project.pbxproj
index 2d122f1..8c6731e 100644
--- a/XUIKit.xcodeproj/project.pbxproj
+++ b/XUIKit.xcodeproj/project.pbxproj
@@ -12,26 +12,26 @@
 		551008EA159BEE7D00C86022 /* XUIGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = 55545A3814EC6B1B0074B45E /* XUIGeometry.m */; };
 		551008EB159BEE7D00C86022 /* XUIGraphics.m in Sources */ = {isa = PBXBuildFile; fileRef = 55545A2E14EC68F80074B45E /* XUIGraphics.m */; };
 		55100902159BEE7D00C86022 /* XUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = 55545A1E14EC60D70074B45E /* XUIView.m */; };
-		55100903159BEEA600C86022 /* XUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 55D4248614EDDB31001F6F71 /* XUIKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		55100907159BEED100C86022 /* XUIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A3714EC6B1B0074B45E /* XUIGeometry.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		55100908159BEED100C86022 /* XUIGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A2D14EC68F70074B45E /* XUIGraphics.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		55100920159BEED100C86022 /* XUIView.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A1D14EC60D70074B45E /* XUIView.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		559BE0C2159C151F00A1735C /* XUIBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A3514EC69500074B45E /* XUIBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55100903159BEEA600C86022 /* XUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 55D4248614EDDB31001F6F71 /* XUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55100907159BEED100C86022 /* XUIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A3714EC6B1B0074B45E /* XUIGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55100908159BEED100C86022 /* XUIGraphics.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A2D14EC68F70074B45E /* XUIGraphics.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55100920159BEED100C86022 /* XUIView.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A1D14EC60D70074B45E /* XUIView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		559BE0C2159C151F00A1735C /* XUIBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 55545A3514EC69500074B45E /* XUIBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		559BE0EF159C19F900A1735C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559BE0EE159C19F800A1735C /* QuartzCore.framework */; };
-		55F84906181CC05700BABB66 /* XUITypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84905181CC05700BABB66 /* XUITypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		55F8490C181CC13A00BABB66 /* XUIBezierPathAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84908181CC13A00BABB66 /* XUIBezierPathAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F84906181CC05700BABB66 /* XUITypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84905181CC05700BABB66 /* XUITypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55F8490C181CC13A00BABB66 /* XUIBezierPathAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84908181CC13A00BABB66 /* XUIBezierPathAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F8490D181CC13A00BABB66 /* XUIBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F84909181CC13A00BABB66 /* XUIBezierPathAdditions.m */; };
-		55F8490E181CC13A00BABB66 /* XUIColorAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F8490A181CC13A00BABB66 /* XUIColorAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F8490E181CC13A00BABB66 /* XUIColorAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F8490A181CC13A00BABB66 /* XUIColorAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F8490F181CC13A00BABB66 /* XUIColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F8490B181CC13A00BABB66 /* XUIColorAdditions.m */; };
-		55F84912181CC16C00BABB66 /* XUIFontAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84910181CC16C00BABB66 /* XUIFontAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F84912181CC16C00BABB66 /* XUIFontAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84910181CC16C00BABB66 /* XUIFontAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F84913181CC16C00BABB66 /* XUIFontAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F84911181CC16C00BABB66 /* XUIFontAdditions.m */; };
-		55F84916181CC21A00BABB66 /* XUIIndexPathAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84914181CC21A00BABB66 /* XUIIndexPathAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F84916181CC21A00BABB66 /* XUIIndexPathAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84914181CC21A00BABB66 /* XUIIndexPathAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F84917181CC21A00BABB66 /* XUIIndexPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F84915181CC21A00BABB66 /* XUIIndexPathAdditions.m */; };
-		55F8491A181CC22500BABB66 /* XUIValueAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84918181CC22500BABB66 /* XUIValueAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F8491A181CC22500BABB66 /* XUIValueAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84918181CC22500BABB66 /* XUIValueAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F8491B181CC22500BABB66 /* XUIValueAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F84919181CC22500BABB66 /* XUIValueAdditions.m */; };
 		55F8491E181CC2BB00BABB66 /* XUIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F8491C181CC2BB00BABB66 /* XUIViewAdditions.m */; };
-		55F8491F181CC2BB00BABB66 /* XUIViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F8491D181CC2BB00BABB66 /* XUIViewAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		55F84922181CC99900BABB66 /* XUIImageAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84920181CC99900BABB66 /* XUIImageAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		55F8491F181CC2BB00BABB66 /* XUIViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F8491D181CC2BB00BABB66 /* XUIViewAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55F84922181CC99900BABB66 /* XUIImageAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 55F84920181CC99900BABB66 /* XUIImageAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		55F84923181CC99900BABB66 /* XUIImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F84921181CC99900BABB66 /* XUIImageAdditions.m */; };
 /* End PBXBuildFile section */
 
@@ -328,6 +328,7 @@
 			baseConfigurationReference = 5579297B14FEE1FC00FCDE7C /* XUIKit_Mac_Debug.xcconfig */;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
@@ -341,6 +342,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
@@ -354,6 +356,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;

From ffb6d59cdbcd815e986fab7e67f76706a3a369bc Mon Sep 17 00:00:00 2001
From: hashfunction <ahmed@ookla.com>
Date: Wed, 16 Dec 2015 16:21:20 -0800
Subject: [PATCH 03/10] Removed xcode local project data

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd27357
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+XUIKit.xcodeproj/xcuserdata

From 59eaaf1672465251bb3dd0acdb66a83d56ef7338 Mon Sep 17 00:00:00 2001
From: Matias Piipari <matias.piipari@gmail.com>
Date: Sun, 22 May 2016 23:15:10 +0100
Subject: [PATCH 04/10] Modernises build settings according Xcode wishes; Adds
 a shared scheme for Carthage compatibility.

---
 .gitignore                                    |  3 +
 Resources/Info.plist                          |  2 +-
 Source/XUIFontAdditions.m                     |  2 +-
 XUIKit.xcodeproj/project.pbxproj              |  6 +-
 .../contents.xcworkspacedata                  |  7 ++
 .../xcshareddata/xcschemes/XUIKit.xcscheme    | 80 +++++++++++++++++++
 6 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ebc85fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+Carthage/Build
+.DS_Store
+*.xcuserdatad
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 8ad60c9..3d55dbd 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.iccir.XUIKit</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Source/XUIFontAdditions.m b/Source/XUIFontAdditions.m
index 422a95b..1705d78 100644
--- a/Source/XUIFontAdditions.m
+++ b/Source/XUIFontAdditions.m
@@ -93,7 +93,7 @@ - (CGFloat) xui_lineHeight
     int unitsPerEm = CTFontGetUnitsPerEm(ctFont);
 
     long ascent  = lroundf( (     CTFontGetAscent( ctFont)  /  unitsPerEm) * pointSize);
-    long descent = lroundf(-(-abs(CTFontGetDescent(ctFont)) /  unitsPerEm) * pointSize);
+    long descent = lroundf(-(-fabs(CTFontGetDescent(ctFont)) /  unitsPerEm) * pointSize);
     long lineGap = lroundf( (     CTFontGetLeading(ctFont)  /  unitsPerEm) * pointSize);
     
     return ascent + descent + lineGap;
diff --git a/XUIKit.xcodeproj/project.pbxproj b/XUIKit.xcodeproj/project.pbxproj
index 2d122f1..ecfbed3 100644
--- a/XUIKit.xcodeproj/project.pbxproj
+++ b/XUIKit.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
 		555459F514EC607B0074B45E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0730;
 			};
 			buildConfigurationList = 555459F814EC607B0074B45E /* Build configuration list for PBXProject "XUIKit" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -332,6 +332,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
 			};
 			name = Debug;
 		};
@@ -345,6 +346,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
 			};
 			name = Profile;
 		};
@@ -358,12 +360,14 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
 			};
 			name = Release;
 		};
 		55545A1214EC607B0074B45E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 			};
diff --git a/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme b/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme
new file mode 100644
index 0000000..289980b
--- /dev/null
+++ b/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.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 = "551008D2159BEE4000C86022"
+               BuildableName = "XUIKit.framework"
+               BlueprintName = "XUIKit"
+               ReferencedContainer = "container:XUIKit.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 = "551008D2159BEE4000C86022"
+            BuildableName = "XUIKit.framework"
+            BlueprintName = "XUIKit"
+            ReferencedContainer = "container:XUIKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "551008D2159BEE4000C86022"
+            BuildableName = "XUIKit.framework"
+            BlueprintName = "XUIKit"
+            ReferencedContainer = "container:XUIKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

From c8f7e46784e3cf6b74d25f98a75674caef6ff712 Mon Sep 17 00:00:00 2001
From: Matias Piipari <matias.piipari@gmail.com>
Date: Sun, 22 May 2016 23:20:11 +0100
Subject: [PATCH 05/10] Defines a module.

---
 XUIKit.xcodeproj/project.pbxproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/XUIKit.xcodeproj/project.pbxproj b/XUIKit.xcodeproj/project.pbxproj
index ecfbed3..2fa2f65 100644
--- a/XUIKit.xcodeproj/project.pbxproj
+++ b/XUIKit.xcodeproj/project.pbxproj
@@ -367,6 +367,7 @@
 		55545A1214EC607B0074B45E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEFINES_MODULE = YES;
 				ENABLE_TESTABILITY = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
@@ -376,6 +377,7 @@
 		55545A1314EC607B0074B45E /* Profile */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEFINES_MODULE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 			};
 			name = Profile;
@@ -383,6 +385,7 @@
 		5579298314FEE20900FCDE7C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEFINES_MODULE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 			};
 			name = Release;

From cc0bbd4842a2f2dfe8cffc30b6a415b18f0e1524 Mon Sep 17 00:00:00 2001
From: Matias Piipari <matias.piipari@gmail.com>
Date: Sun, 22 May 2016 23:22:32 +0100
Subject: [PATCH 06/10] Adds Cocoa.h header imports to make module based
 importing happy.

---
 Source/XUIBezierPathAdditions.h | 2 ++
 Source/XUIColorAdditions.h      | 1 +
 Source/XUIFontAdditions.h       | 2 ++
 Source/XUIGeometry.h            | 2 +-
 Source/XUIGraphics.h            | 1 +
 Source/XUIImageAdditions.h      | 3 +--
 Source/XUIIndexPathAdditions.h  | 4 +++-
 Source/XUIValueAdditions.h      | 1 +
 Source/XUIView.h                | 1 +
 Source/XUIViewAdditions.h       | 1 +
 10 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Source/XUIBezierPathAdditions.h b/Source/XUIBezierPathAdditions.h
index 0d37d04..f80aa56 100644
--- a/Source/XUIBezierPathAdditions.h
+++ b/Source/XUIBezierPathAdditions.h
@@ -18,6 +18,8 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
+
 #import <XUIKit/XUITypes.h>
 
 
diff --git a/Source/XUIColorAdditions.h b/Source/XUIColorAdditions.h
index 6a71f2b..f542bb9 100644
--- a/Source/XUIColorAdditions.h
+++ b/Source/XUIColorAdditions.h
@@ -18,6 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
 
 @interface NSColor (XUIKitAdditions)
 
diff --git a/Source/XUIFontAdditions.h b/Source/XUIFontAdditions.h
index f65d37c..eb73a29 100644
--- a/Source/XUIFontAdditions.h
+++ b/Source/XUIFontAdditions.h
@@ -18,6 +18,8 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
+
 @interface NSFont (XUIKitAdditions)
 
 + (NSArray *) familyNames;
diff --git a/Source/XUIGeometry.h b/Source/XUIGeometry.h
index a673e01..35cd80b 100644
--- a/Source/XUIGeometry.h
+++ b/Source/XUIGeometry.h
@@ -18,7 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 #import <ApplicationServices/ApplicationServices.h>
 
 
diff --git a/Source/XUIGraphics.h b/Source/XUIGraphics.h
index 7199a20..0e79bf9 100644
--- a/Source/XUIGraphics.h
+++ b/Source/XUIGraphics.h
@@ -18,6 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
 #import <XUIKit/XUIBase.h>
 
 @class NSImage;
diff --git a/Source/XUIImageAdditions.h b/Source/XUIImageAdditions.h
index 2514e43..feaf94f 100644
--- a/Source/XUIImageAdditions.h
+++ b/Source/XUIImageAdditions.h
@@ -19,8 +19,7 @@
 */
 
 #import <XUIKit/XUITypes.h>
-#import <Foundation/Foundation.h>
-
+#import <Cocoa/Cocoa.h>
 
 @class CIImage;
 
diff --git a/Source/XUIIndexPathAdditions.h b/Source/XUIIndexPathAdditions.h
index 4895386..11cf26a 100644
--- a/Source/XUIIndexPathAdditions.h
+++ b/Source/XUIIndexPathAdditions.h
@@ -17,8 +17,10 @@
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#import <XUIKit/XUITypes.h>
 
+#import <Cocoa/Cocoa.h>
+
+#import <XUIKit/XUITypes.h>
 
 @interface NSIndexPath (XUIKitAdditions)
 
diff --git a/Source/XUIValueAdditions.h b/Source/XUIValueAdditions.h
index 1100afb..222e0ca 100644
--- a/Source/XUIValueAdditions.h
+++ b/Source/XUIValueAdditions.h
@@ -18,6 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
 #import <XUIKit/XUITypes.h>
 #import <XUIKit/XUIGeometry.h>
 
diff --git a/Source/XUIView.h b/Source/XUIView.h
index 2c3d6a1..e05b08d 100644
--- a/Source/XUIView.h
+++ b/Source/XUIView.h
@@ -18,6 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
 #import <XUIKit/XUITypes.h>
 #import <XUIKit/XUIGeometry.h>
 #import <AppKit/NSView.h>
diff --git a/Source/XUIViewAdditions.h b/Source/XUIViewAdditions.h
index 20cb436..ee0b5a7 100644
--- a/Source/XUIViewAdditions.h
+++ b/Source/XUIViewAdditions.h
@@ -18,6 +18,7 @@
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#import <Cocoa/Cocoa.h>
 #import <XUIKit/XUITypes.h>
 
 

From 887d9f9b2850024c841e21b53cc5b91591645f94 Mon Sep 17 00:00:00 2001
From: Matias Piipari <matias.piipari@gmail.com>
Date: Sun, 22 May 2016 23:24:18 +0100
Subject: [PATCH 07/10] Limits to x86_64 and OSX 10.10

---
 XUIKit.xcodeproj/project.pbxproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/XUIKit.xcodeproj/project.pbxproj b/XUIKit.xcodeproj/project.pbxproj
index 2fa2f65..21b58cc 100644
--- a/XUIKit.xcodeproj/project.pbxproj
+++ b/XUIKit.xcodeproj/project.pbxproj
@@ -332,7 +332,9 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
@@ -346,7 +348,9 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+				VALID_ARCHS = x86_64;
 			};
 			name = Profile;
 		};
@@ -360,7 +364,9 @@
 				DYLIB_CURRENT_VERSION = 1;
 				GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
 				MACH_O_TYPE = mh_dylib;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};

From c99f8b9222b69de9a8f262b0f082261f5174bc9e Mon Sep 17 00:00:00 2001
From: David Hedbor <david@ookla.com>
Date: Tue, 5 Jul 2016 10:53:12 -0700
Subject: [PATCH 08/10] Automated fix


From b7dbd3d4ef4eef1163d0bec08d639a983df9ffa0 Mon Sep 17 00:00:00 2001
From: David Hedbor <david@ookla.com>
Date: Wed, 6 Jul 2016 13:10:18 -0700
Subject: [PATCH 09/10] Remove the scheme that keeps changing things.


From ff242581863e54585067164876ece9ddd176f08b Mon Sep 17 00:00:00 2001
From: David Hedbor <david@ookla.com>
Date: Fri, 8 Jul 2016 15:24:49 -0700
Subject: [PATCH 10/10] Remove user data.