Merge pull request #33 from kennytm/carthage-osx-bitcode-fix

Do not allow bitcode on OS X target (fix Carthage dependecy failure).
robrix · Apr 27, 2016 · becbb81 · becbb81
2 parents 2dd36e4 + fb81db1
commit becbb81
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Box.xcodeproj/project.pbxproj b/Box.xcodeproj/project.pbxproj
@@ -400,7 +400,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
-				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -448,7 +447,6 @@
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

diff --git a/BoxTests/BoxTypeTests.swift b/BoxTests/BoxTypeTests.swift
@@ -18,7 +18,7 @@ class BoxTypeTests: XCTestCase {
 
 	func testMap() {
 		let a = Box(1)
-		let b: Box<String> = map(a, toString)
+		let b: Box<String> = map(a) { String($0) }
 		XCTAssertEqual(b.value, "1")
 	}
 }