jarsen · gregpardo · Mar 24, 2016 · Mar 24, 2016
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "antitypical/Result" ~> 0.4
+github "antitypical/Result" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1 @@
-github "robrix/Box" "1.2.2"
-github "antitypical/Result" "0.4.2"
+github "antitypical/Result" "96970bf1a00a8b0c171716652070c6f8301829b4"
diff --git a/Pipes.xcodeproj/project.pbxproj b/Pipes.xcodeproj/project.pbxproj
@@ -11,14 +11,13 @@
 		1EA6037D1AEFE4BB00B1E32B /* Pipes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EA603711AEFE4BB00B1E32B /* Pipes.framework */; };
 		1EA6038E1AEFE53700B1E32B /* ForwardPipe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA6038D1AEFE53700B1E32B /* ForwardPipe.swift */; };
 		1EA603901AEFE62400B1E32B /* ForwardPipeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA6038F1AEFE62400B1E32B /* ForwardPipeTests.swift */; };
-		1EA603921AEFE63900B1E32B /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA603911AEFE63900B1E32B /* TestHelpers.swift */; };
 		1EA603981AEFE8B800B1E32B /* BackwardPipe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA603971AEFE8B800B1E32B /* BackwardPipe.swift */; };
 		1EA6039A1AF018C500B1E32B /* BackwardPipeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA603991AF018C500B1E32B /* BackwardPipeTests.swift */; };
 		1EA6039C1AF0259100B1E32B /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA6039B1AF0259100B1E32B /* Result.swift */; };
-		1EA603A41AF0272600B1E32B /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EA603A21AF0272600B1E32B /* Box.framework */; };
-		1EA603A51AF0272600B1E32B /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EA603A31AF0272600B1E32B /* Result.framework */; };
 		1EA603A91AF0298C00B1E32B /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EA603A81AF0298C00B1E32B /* Optional.swift */; };
 		1EE819001B0A40CB00445D9F /* PureHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE818FF1B0A40CB00445D9F /* PureHelpers.swift */; };
+		436ECAB51CA465410058B96A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 436ECAB11CA464470058B96A /* Result.framework */; };
+		436ECAB91CA46EA00058B96A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 436ECAB11CA464470058B96A /* Result.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,30 +51,28 @@
 		1EA603821AEFE4BB00B1E32B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1EA6038D1AEFE53700B1E32B /* ForwardPipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForwardPipe.swift; sourceTree = "<group>"; };
 		1EA6038F1AEFE62400B1E32B /* ForwardPipeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForwardPipeTests.swift; sourceTree = "<group>"; };
-		1EA603911AEFE63900B1E32B /* TestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
 		1EA603971AEFE8B800B1E32B /* BackwardPipe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackwardPipe.swift; sourceTree = "<group>"; };
 		1EA603991AF018C500B1E32B /* BackwardPipeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackwardPipeTests.swift; sourceTree = "<group>"; };
 		1EA6039B1AF0259100B1E32B /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
-		1EA603A21AF0272600B1E32B /* Box.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Box.framework; sourceTree = BUILD_PRODUCTS_DIR; };
-		1EA603A31AF0272600B1E32B /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILD_PRODUCTS_DIR; };
 		1EA603A81AF0298C00B1E32B /* Optional.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
 		1EE818FF1B0A40CB00445D9F /* PureHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PureHelpers.swift; sourceTree = "<group>"; };
+		436ECAB11CA464470058B96A /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		1EA6036D1AEFE4BB00B1E32B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1EA603A41AF0272600B1E32B /* Box.framework in Frameworks */,
-				1EA603A51AF0272600B1E32B /* Result.framework in Frameworks */,
+				436ECAB51CA465410058B96A /* Result.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		1EA603791AEFE4BB00B1E32B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				436ECAB91CA46EA00058B96A /* Result.framework in Frameworks */,
 				1EA6037D1AEFE4BB00B1E32B /* Pipes.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -86,8 +83,7 @@
 		1EA603671AEFE4BB00B1E32B = {
 			isa = PBXGroup;
 			children = (
-				1EA603A21AF0272600B1E32B /* Box.framework */,
-				1EA603A31AF0272600B1E32B /* Result.framework */,
+				436ECAB11CA464470058B96A /* Result.framework */,
 				1EA603731AEFE4BB00B1E32B /* Pipes */,
 				1EA603801AEFE4BB00B1E32B /* PipesTests */,
 				1EA603721AEFE4BB00B1E32B /* Products */,
@@ -129,7 +125,6 @@
 			isa = PBXGroup;
 			children = (
 				1EA603991AF018C500B1E32B /* BackwardPipeTests.swift */,
-				1EA603911AEFE63900B1E32B /* TestHelpers.swift */,
 				1EA6038F1AEFE62400B1E32B /* ForwardPipeTests.swift */,
 				1EA603811AEFE4BB00B1E32B /* Supporting Files */,
 			);
@@ -166,6 +161,7 @@
 				1EA6036D1AEFE4BB00B1E32B /* Frameworks */,
 				1EA6036E1AEFE4BB00B1E32B /* Headers */,
 				1EA6039F1AF025C700B1E32B /* Copy Frameworks */,
+				436ECAAF1CA464130058B96A /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -183,6 +179,7 @@
 				1EA603781AEFE4BB00B1E32B /* Sources */,
 				1EA603791AEFE4BB00B1E32B /* Frameworks */,
 				1EA6037A1AEFE4BB00B1E32B /* Resources */,
+				436ECABA1CA46EAC0058B96A /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -200,7 +197,9 @@
 		1EA603681AEFE4BB00B1E32B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastSwiftMigration = 0730;
+				LastSwiftUpdateCheck = 0730;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "Jason Larsen";
 				TargetAttributes = {
 					1EA603701AEFE4BB00B1E32B = {
@@ -239,6 +238,37 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		436ECAAF1CA464130058B96A /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/iOS/Result.framework",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/local/bin/carthage copy-frameworks";
+		};
+		436ECABA1CA46EAC0058B96A /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/iOS/Result.framework",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/usr/local/bin/carthage copy-frameworks";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		1EA6036C1AEFE4BB00B1E32B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -258,7 +288,6 @@
 			files = (
 				1EA603901AEFE62400B1E32B /* ForwardPipeTests.swift in Sources */,
 				1EA6039A1AF018C500B1E32B /* BackwardPipeTests.swift in Sources */,
-				1EA603921AEFE63900B1E32B /* TestHelpers.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -295,6 +324,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -370,14 +400,19 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				INFOPLIST_FILE = Pipes/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.jasonlarsen.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Debug;
 		};
@@ -389,13 +424,18 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				INFOPLIST_FILE = Pipes/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.jasonlarsen.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Release;
 		};
@@ -405,13 +445,15 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = PipesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.jasonlarsen.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -422,9 +464,11 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = PipesTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "me.jasonlarsen.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/Pipes.xcodeproj/xcshareddata/xcschemes/Pipes.xcscheme b/Pipes.xcodeproj/xcshareddata/xcschemes/Pipes.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:Pipes.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/Pipes/Info.plist b/Pipes/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.jasonlarsen.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "antitypical/Result" ~> 0.4
		github "antitypical/Result" "master"