Merge remote-tracking branch 'origin/master' into 0.5-development

Carthage · Dec 25, 2014 · ab73e9e · ab73e9e
2 parents f9a1365 + dca1e22
commit ab73e9e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/Carthage.xcodeproj/project.pbxproj b/Carthage.xcodeproj/project.pbxproj
@@ -424,6 +424,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D0E7B64919E9C64600EDBA4D /* Build configuration list for PBXNativeTarget "carthage" */;
 			buildPhases = (
+				C2265FAB1A4B86AC00158358 /* Check Xcode Version */,
 				D0E7B62E19E9C64500EDBA4D /* Sources */,
 				D0E7B62F19E9C64500EDBA4D /* Frameworks */,
 				D0E7B63019E9C64500EDBA4D /* Resources */,
@@ -509,6 +510,20 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		C2265FAB1A4B86AC00158358 /* Check Xcode Version */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Xcode Version";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = ". script/check-xcode-version";
+		};
 		D0AE6B171A0E931300E0E17D /* Copy Fixtures */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/README.md b/README.md
@@ -63,6 +63,8 @@ Once you have Carthage [installed](#installing-carthage), you can begin adding f
   $(SRCROOT)/Carthage/Build/iOS/LlamaKit.framework
   $(SRCROOT)/Carthage/Build/iOS/ReactiveCocoa.framework
   ```
+
+  This script works around an [App Store submission bug](http://www.openradar.me/radar?id=6409498411401216) triggered by universal binaries.
 
 ##### For both platforms
 
@@ -126,7 +128,7 @@ Carthage is released under the [MIT License](LICENSE.md).
 
 [Artifacts]: Documentation/Artifacts.md
 [Cartfile]: Documentation/Artifacts.md#cartfile
-[Cartfile.resolved]: Documentation/Artifacts.md#cartfilelock
+[Cartfile.resolved]: Documentation/Artifacts.md#cartfileresolved
 [Carthage/Build]: Documentation/Artifacts.md#carthagebuild
 [Carthage/Checkouts]: Documentation/Artifacts.md#carthagecheckouts
-[CarthageKit]: CarthageKit
+[CarthageKit]: Source/CarthageKit
diff --git a/Source/CarthageKit/Xcode.swift b/Source/CarthageKit/Xcode.swift
@@ -662,8 +662,7 @@ private func mergeBuildProductsIntoDirectory(firstProductSettings: BuildSettings
 					return destinationFolderURL.URLByAppendingPathComponent(modulesPath!)
 				}
 
-			let mergeProductModules = sourceModulesURL
-				.zipWith(destinationModulesURL)
+			let mergeProductModules = zip(sourceModulesURL, destinationModulesURL)
 				.map { (source: NSURL, destination: NSURL) -> ColdSignal<NSURL> in
 					return mergeModuleIntoModule(source, destination)
 				}

diff --git a/Source/carthage/Build.swift b/Source/carthage/Build.swift
@@ -30,7 +30,7 @@ public struct BuildCommand: CommandType {
 				let directoryURL = NSURL.fileURLWithPath(options.directoryPath, isDirectory: true)!
 
 				let (stdoutSignal, schemeSignals) = self.buildProjectInDirectoryURL(directoryURL, options: options)
-				let disposable = stdoutSignal.observe { data in
+				stdoutSignal.observe { data in
 					stdoutHandle.writeData(data)
 					stdoutHandle.synchronizeFile()
 				}
@@ -41,8 +41,6 @@ public struct BuildCommand: CommandType {
 						carthage.println("*** xcodebuild output can be found in \(temporaryURL.path!)")
 					}, next: { (project, scheme) in
 						carthage.println("*** Building scheme \"\(scheme)\" in \(project)")
-					}, disposed: {
-						disposable.dispose()
 					})
 					.then(.empty())
 			}

diff --git a/Source/carthage/CopyFrameworks.swift b/Source/carthage/CopyFrameworks.swift
@@ -25,11 +25,9 @@ public struct CopyFrameworksCommand: CommandType {
 				let source = NSURL(fileURLWithPath: frameworkPath, isDirectory: true)!
 				let target = frameworksFolder().map { $0.URLByAppendingPathComponent(frameworkName, isDirectory: true) }
 
-				return ColdSignal.fromResult(target)
-					.combineLatestWith(.fromResult(validArchitectures()))
+				return combineLatest(ColdSignal.fromResult(target), .fromResult(validArchitectures()))
 					.mergeMap { (target, validArchitectures) -> ColdSignal<()> in
-						return copyFramework(source, target)
-							.combineLatestWith(.fromResult(getEnvironmentVariable("EXPANDED_CODE_SIGN_IDENTITY")))
+						return combineLatest(copyFramework(source, target), .fromResult(getEnvironmentVariable("EXPANDED_CODE_SIGN_IDENTITY")))
 							.mergeMap { (url, codesigningIdentity) -> ColdSignal<()> in
 								return stripFramework(target, keepingArchitectures: validArchitectures, codesigningIdentity: codesigningIdentity)
 							}

diff --git a/script/check-xcode-version b/script/check-xcode-version
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Check the minimum required Xcode version. Meant to be run
+# as part of an Xcode Run Script build phase.
+
+required_xcode_version=6.1.1
+
+if [ ${XCODE_VERSION_ACTUAL} -lt ${required_xcode_version//.} ]
+then
+    echo "error: Xcode ${required_xcode_version} or later is required to build ${PRODUCT_NAME}"
+    exit 1
+fi