Use modulemap instead of bridging header

Conflicts: Project/NSData+GZIP.xcodeproj/project.pbxproj
jean-bovet · Aug 31, 2015 · a6e5d8c · a6e5d8c
1 parent 06e63c1
commit a6e5d8c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Change Log
 
 - Migrate code to Swift 2.0
 - Change to throw error instead returning `nil`.
+- Use Modulemap for zlib instead of `Bridging-Header.h` (see README for how to install).
 
 
 

diff --git a/Documentation/binary_link@2x.png b/Documentation/binary_link@2x.png
diff --git a/Documentation/search_paths@2x.png b/Documentation/search_paths@2x.png
diff --git a/Project/NSData+GZIP.xcodeproj/project.pbxproj b/Project/NSData+GZIP.xcodeproj/project.pbxproj
@@ -20,12 +20,12 @@
 		2A58A75B1B00F414005FBBC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2A58A75C1B00F414005FBBC2 /* NSData_GZIPTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSData_GZIPTests.swift; sourceTree = "<group>"; };
 		2A58A7611B00F42C005FBBC2 /* NSData+GZIP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+GZIP.swift"; sourceTree = "<group>"; };
-		2A58A7681B00F70A005FBBC2 /* NSData+GZIPTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+GZIPTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		2A58A77D1B00FBEF005FBBC2 /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2A58A7801B00FBF0005FBBC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2AD497381B8E2A2D00AFBA1B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		2AD4973A1B8E2A3800AFBA1B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
 		2AF7F0BE1B6E1CD100EBA69A /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = SOURCE_ROOT; };
+		2AFCA7931B661CB5006DF1F4 /* zlib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = zlib; path = ../zlib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -53,6 +53,7 @@
 			children = (
 				2AF7F0BE1B6E1CD100EBA69A /* CHANGELOG.md */,
 				2A58A7631B00F437005FBBC2 /* NSData+GZIP */,
+				2AFCA7941B661CBA006DF1F4 /* Modules */,
 				2A58A7881B00FD11005FBBC2 /* Tests */,
 				2A58A7581B00F414005FBBC2 /* Products */,
 			);
@@ -123,7 +124,6 @@
 			isa = PBXGroup;
 			children = (
 				2A58A75C1B00F414005FBBC2 /* NSData_GZIPTests.swift */,
-				2A58A7681B00F70A005FBBC2 /* NSData+GZIPTests-Bridging-Header.h */,
 				2A58A7591B00F414005FBBC2 /* OS X */,
 				2A58A77E1B00FBEF005FBBC2 /* iOS */,
 			);
@@ -138,6 +138,14 @@
 			name = Libraries;
 			sourceTree = "<group>";
 		};
+		2AFCA7941B661CBA006DF1F4 /* Modules */ = {
+			isa = PBXGroup;
+			children = (
+				2AFCA7931B661CB5006DF1F4 /* zlib */,
+			);
+			name = Modules;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -257,7 +265,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/NSData+GZIPTests-Bridging-Header.h";
+				SWIFT_INCLUDE_PATHS = ../zlib;
 			};
 			name = Debug;
 		};
@@ -266,7 +274,7 @@
 			buildSettings = {
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/NSData+GZIPTests-Bridging-Header.h";
+				SWIFT_INCLUDE_PATHS = ../zlib;
 			};
 			name = Release;
 		};

diff --git a/Project/Tests/NSData+GZIPTests-Bridging-Header.h b/Project/Tests/NSData+GZIPTests-Bridging-Header.h
diff --git a/README.md b/README.md
@@ -23,8 +23,11 @@ let decompressedData : NSData = try! compressedData.gunzippedData()
 ## Installation
 
 1. Add `NSData+GZIP.swift` file to your project.
-2. Add `libz.tbd` library to your project.
-3. Add a line `#include <zlib.h>` to your ProjectName-Bridging-Header.h file.
+2. Add `zlib/` directory to your project.
+3. In *Build Phases*, add `libz.tbd` library to your project.
+    ![screenshot](Documentation/binary_link@2x.png)
+4. In *Build Settings* > *Swift Compiler - Search Paths*, Add path to `zlib/` to Import Paths (`SWIFT_INCLUDE_PATHS`).
+    ![screenshot](Documentation/search_paths@2x.png)
 4. Invoke from your Swift/ObjC files.
 
 

diff --git a/Sources/NSData+GZIP.swift b/Sources/NSData+GZIP.swift
@@ -28,6 +28,7 @@
  */
 
 import Foundation
+import zlib
 
 private let CHUNK_SIZE: Int = 2 ^ 14
 private let STREAM_SIZE: Int32 = Int32(sizeof(z_stream))

diff --git a/zlib/include.h b/zlib/include.h
@@ -0,0 +1 @@
+#include <zlib.h>
diff --git a/zlib/module.modulemap b/zlib/module.modulemap
@@ -0,0 +1,4 @@
+module zlib [system] {
+    header "include.h"
+    export *
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@ Change Log

		- Migrate code to Swift 2.0
		- Change to throw error instead returning `nil`.
		- Use Modulemap for zlib instead of `Bridging-Header.h` (see README for how to install).



Expand Down