Merge pull request #711 from ParsePlatform/nlutsenko.bolts.dynamic

Use dynamic framework version of Bolts.

Author: nlutsenko

Configurations/Parse-OSX.xcconfig

@@ -17,6 +17,4 @@ MACH_O_TYPE = mh_dylib
 DEFINES_MODULE = YES
 DYLIB_INSTALL_NAME_BASE = @rpath
 
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/osx/
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-OSX.Info.plist

Configurations/Parse-iOS.xcconfig

@@ -17,8 +17,6 @@ APPLICATION_EXTENSION_API_ONLY = YES
 MACH_O_TYPE = staticlib
 DEFINES_MODULE = YES
 
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/ios/
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
 
 OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode

Configurations/Parse-tvOS.xcconfig

@@ -19,6 +19,4 @@ DEFINES_MODULE = YES
 
 OTHER_LDFLAGS = $(inherited) -ObjC
 
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/tvOS/
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist

Configurations/Parse-watchOS.xcconfig

@@ -20,6 +20,4 @@ ENABLE_BITCODE = YES
 
 OTHER_LDFLAGS = $(inherited) -ObjC
 
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/watchOS/
-
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist

Configurations/ParseUnitTests-OSX.xcconfig

@@ -15,9 +15,7 @@ PRODUCT_MODULE_NAME = ParseUnitTests
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx
 
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @loader_path/../Frameworks
-
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/osx
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks
 
 USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
 

Configurations/ParseUnitTests-iOS.xcconfig

@@ -18,8 +18,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0
 
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
 
-FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(PROJECT_DIR)/Carthage/Checkouts/Bolts-iOS/build/ios
-
 USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
 
 // Swift

Parse.xcodeproj/project.pbxproj

@@ -219,7 +219,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/ios/Bolts.framework .\nfi\n";
+			shellScript = "# Remove the compiled version of Bolts.framework as we need a static one\nrm -r $BUILT_PRODUCTS_DIR/Bolts.framework\n\nif [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/ios/Bolts.framework .\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Parse.xcworkspace/contents.xcworkspacedata

@@ -282,7 +282,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/ios/Bolts.framework .\nfi\n";
+			shellScript = "# Remove the compiled version of Bolts.framework as we need a static one\nrm -r $BUILT_PRODUCTS_DIR/Bolts.framework\n\nif [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/ios/Bolts.framework .\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */