Refactor isSwiftFramework(_:) not to use SignalProducer

abrindam · Dec 13, 2017 · c94d90e · c94d90e
1 parent eb47e90
commit c94d90e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/Source/CarthageKit/VersionFile.swift b/Source/CarthageKit/VersionFile.swift
@@ -114,17 +114,15 @@ struct VersionFile: Codable {
 			.flatMap(.concat) { cachedFramework -> SignalProducer<Bool, CarthageError> in
 				let frameworkURL = self.frameworkURL(for: cachedFramework, platform: platform, binariesDirectoryURL: binariesDirectoryURL)
 
-				return isSwiftFramework(frameworkURL)
-					.flatMap(.concat) { isSwift -> SignalProducer<Bool, SwiftVersionError> in
-						if !isSwift {
-							return SignalProducer(value: true)
-						}
-
-						return frameworkSwiftVersion(frameworkURL).map { swiftVersion -> Bool in
+				if !isSwiftFramework(frameworkURL) {
+					return SignalProducer(value: true)
+				} else {
+					return frameworkSwiftVersion(frameworkURL)
+						.map { swiftVersion -> Bool in
 							return swiftVersion == localSwiftVersion
 						}
-					}
-					.flatMapError { _ in SignalProducer<Bool, CarthageError>(value: false) }
+						.flatMapError { _ in SignalProducer<Bool, CarthageError>(value: false) }
+				}
 			}
 	}
 

diff --git a/Source/CarthageKit/Xcode.swift b/Source/CarthageKit/Xcode.swift
@@ -65,8 +65,8 @@ internal func frameworkSwiftVersion(_ frameworkURL: URL) -> SignalProducer<Strin
 }
 
 /// Determines whether a framework was built with Swift
-internal func isSwiftFramework(_ frameworkURL: URL) -> SignalProducer<Bool, SwiftVersionError> {
-	return SignalProducer(value: frameworkURL.swiftmoduleURL() != nil)
+internal func isSwiftFramework(_ frameworkURL: URL) -> Bool {
+	return frameworkURL.swiftmoduleURL() != nil
 }
 
 /// Emits the framework URL if it matches the local Swift version and errors if not.
@@ -81,12 +81,11 @@ internal func checkSwiftFrameworkCompatibility(_ frameworkURL: URL, usingToolcha
 
 /// Emits the framework URL if it is compatible with the build environment and errors if not.
 internal func checkFrameworkCompatibility(_ frameworkURL: URL, usingToolchain toolchain: String?) -> SignalProducer<URL, SwiftVersionError> {
-	return isSwiftFramework(frameworkURL)
-		.flatMap(.merge) { isSwift in
-			return isSwift
-				? checkSwiftFrameworkCompatibility(frameworkURL, usingToolchain: toolchain)
-				: SignalProducer(value: frameworkURL)
-		}
+	if isSwiftFramework(frameworkURL) {
+		return checkSwiftFrameworkCompatibility(frameworkURL, usingToolchain: toolchain)
+	} else {
+		return SignalProducer(value: frameworkURL)
+	}
 }
 
 /// Creates a task description for executing `xcodebuild` with the given

diff --git a/Tests/CarthageKitTests/XcodeSpec.swift b/Tests/CarthageKitTests/XcodeSpec.swift
@@ -38,17 +38,13 @@ class XcodeSpec: QuickSpec {
 
 			#if !SWIFT_PACKAGE
 			it("should determine that a Swift framework is a Swift framework") {
-				let result = isSwiftFramework(testSwiftFrameworkURL).single()
-
-				expect(result?.value) == true
+				expect(isSwiftFramework(testSwiftFrameworkURL)) == true
 			}
 			#endif
 
 			it("should determine that an ObjC framework is not a Swift framework") {
 				let frameworkURL = Bundle(for: type(of: self)).url(forResource: "FakeOldObjc.framework", withExtension: nil)!
-				let result = isSwiftFramework(frameworkURL).single()
-
-				expect(result?.value) == false
+				expect(isSwiftFramework(frameworkURL)) == false
 			}
 
 			it("should determine a value for the local swift version") {