Skip to content
This repository has been archived by the owner on Jul 3, 2022. It is now read-only.

Replace custom Box and Result with microframeworks #49

Closed
wants to merge 16 commits into from
Closed

Replace custom Box and Result with microframeworks #49

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5f07f70
Added Cartfile
nvh May 12, 2015
223fab5
carthage bootstrap
nvh May 12, 2015
55861e5
Added frameworks to project
nvh May 12, 2015
36c398b
Added NSError to all type signatures of Result
nvh May 12, 2015
f36b849
Replaced all initializations of Result with the constructor in Result…
nvh May 12, 2015
785b85e
Unboxing errors everywhere
nvh May 12, 2015
cd2c31f
rewriting flatten and sequence
nvh May 12, 2015
41a8459
Removing recover
nvh May 12, 2015
1989958
Commenting out flatMap for futures
nvh May 12, 2015
252761d
Added helper extension for Result to ResultTest
nvh May 12, 2015
e6faea9
Rewriting isSuccess and isFailure with Result.analysis
nvh May 12, 2015
ab81d13
Replaced a lot of switch statements with Result.analysis
nvh May 12, 2015
4f2a7ff
Moved free functions to FutureUtils
nvh May 13, 2015
1f7c8eb
Updated flatMapFuture tests
nvh May 13, 2015
901ce01
Re-enabled recover tests
nvh May 13, 2015
0ee93b9
Update Result to 0.4.2
nvh May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 108 additions & 0 deletions BrightFutures.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
objects = {

/* Begin PBXBuildFile section */
B31A24241B0268F80016AE7A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24221B0268F80016AE7A /* Result.framework */; };
B31A24251B0268F80016AE7A /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24231B0268F80016AE7A /* Box.framework */; };
B31A24291B02691A0016AE7A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24271B02691A0016AE7A /* Result.framework */; };
B31A242A1B02691A0016AE7A /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24281B02691A0016AE7A /* Box.framework */; };
B31A24331B026D4B0016AE7A /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24281B02691A0016AE7A /* Box.framework */; };
B31A24341B026D500016AE7A /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24221B0268F80016AE7A /* Result.framework */; };
B31A24351B026D500016AE7A /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B31A24231B0268F80016AE7A /* Box.framework */; };
B31A243A1B0279120016AE7A /* Result.framework in Resources */ = {isa = PBXBuildFile; fileRef = B31A24271B02691A0016AE7A /* Result.framework */; };
B31A243B1B0279150016AE7A /* Box.framework in Resources */ = {isa = PBXBuildFile; fileRef = B31A24281B02691A0016AE7A /* Box.framework */; };
E9039ADD1A45DF8D000DD6F1 /* ResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9039ADC1A45DF8D000DD6F1 /* ResultTests.swift */; };
E907D1DE1A6AE4A000AB8075 /* Semaphore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E907D1DD1A6AE4A000AB8075 /* Semaphore.swift */; };
E9319EA41A397D2C00A0604A /* QueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9319EA31A397D2C00A0604A /* QueueTests.swift */; };
Expand Down Expand Up @@ -53,6 +62,10 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
B31A24221B0268F80016AE7A /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = "<group>"; };
B31A24231B0268F80016AE7A /* Box.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Box.framework; path = Carthage/Build/iOS/Box.framework; sourceTree = "<group>"; };
B31A24271B02691A0016AE7A /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/Mac/Result.framework; sourceTree = "<group>"; };
B31A24281B02691A0016AE7A /* Box.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Box.framework; path = Carthage/Build/Mac/Box.framework; sourceTree = "<group>"; };
E9039ADC1A45DF8D000DD6F1 /* ResultTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultTests.swift; sourceTree = "<group>"; };
E907D1DD1A6AE4A000AB8075 /* Semaphore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Semaphore.swift; sourceTree = "<group>"; };
E9319EA31A397D2C00A0604A /* QueueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueueTests.swift; sourceTree = "<group>"; };
Expand All @@ -78,6 +91,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B31A24291B02691A0016AE7A /* Result.framework in Frameworks */,
B31A242A1B02691A0016AE7A /* Box.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -86,13 +101,17 @@
buildActionMask = 2147483647;
files = (
E9D45B0B1AF00659000F6CA7 /* BrightFutures.framework in Frameworks */,
B31A24331B026D4B0016AE7A /* Box.framework in Frameworks */,
B31A24321B026D4B0016AE7A /* Result.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E9DF0811194470060083F7F2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B31A24241B0268F80016AE7A /* Result.framework in Frameworks */,
B31A24251B0268F80016AE7A /* Box.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -101,15 +120,45 @@
buildActionMask = 2147483647;
files = (
E9DF0821194470060083F7F2 /* BrightFutures.framework in Frameworks */,
B31A24351B026D500016AE7A /* Box.framework in Frameworks */,
B31A24341B026D500016AE7A /* Result.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
B31A24261B0269060016AE7A /* Frameworks */ = {
isa = PBXGroup;
children = (
B31A242B1B0269280016AE7A /* Mac */,
B31A242C1B02692E0016AE7A /* iOS */,
);
name = Frameworks;
sourceTree = "<group>";
};
B31A242B1B0269280016AE7A /* Mac */ = {
isa = PBXGroup;
children = (
B31A24271B02691A0016AE7A /* Result.framework */,
B31A24281B02691A0016AE7A /* Box.framework */,
);
name = Mac;
sourceTree = "<group>";
};
B31A242C1B02692E0016AE7A /* iOS */ = {
isa = PBXGroup;
children = (
B31A24221B0268F80016AE7A /* Result.framework */,
B31A24231B0268F80016AE7A /* Box.framework */,
);
name = iOS;
sourceTree = "<group>";
};
E9DF080B194470060083F7F2 = {
isa = PBXGroup;
children = (
B31A24261B0269060016AE7A /* Frameworks */,
E9DF0817194470060083F7F2 /* BrightFutures */,
E9DF0824194470060083F7F2 /* BrightFuturesTests */,
E9DF0816194470060083F7F2 /* Products */,
Expand Down Expand Up @@ -235,6 +284,7 @@
E9DF0811194470060083F7F2 /* Frameworks */,
E9DF0812194470060083F7F2 /* Headers */,
E9DF0813194470060083F7F2 /* Resources */,
B31A242E1B0269790016AE7A /* Carthage */,
);
buildRules = (
);
Expand All @@ -252,6 +302,7 @@
E9DF081C194470060083F7F2 /* Sources */,
E9DF081D194470060083F7F2 /* Frameworks */,
E9DF081E194470060083F7F2 /* Resources */,
B31A24381B02785F0016AE7A /* Carthage */,
);
buildRules = (
);
Expand Down Expand Up @@ -319,6 +370,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B31A243B1B0279150016AE7A /* Box.framework in Resources */,
B31A243A1B0279120016AE7A /* Result.framework in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -338,6 +391,41 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
B31A242E1B0269790016AE7A /* Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/Box.framework",
"$(SRCROOT)/Carthage/Build/iOS/Result.framework",
);
name = Carthage;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
B31A24381B02785F0016AE7A /* Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/Box.framework",
"$(SRCROOT)/Carthage/Build/iOS/Result.framework",
);
name = Carthage;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
E9D45AFB1AF00659000F6CA7 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -417,6 +505,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -445,6 +537,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = BrightFutures/Info.plist;
Expand All @@ -466,6 +562,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand All @@ -490,6 +587,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = BrightFuturesTests/Info.plist;
Expand Down Expand Up @@ -595,6 +693,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = BrightFutures/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -613,6 +715,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = BrightFutures/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -627,6 +733,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -645,6 +752,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = BrightFuturesTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
Loading