Skip to content

Update Bolts submodule link and path. #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2016
Merged

Update Bolts submodule link and path. #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "Vendor/xctoolchain"]
path = Vendor/xctoolchain
url = https://github.com/ParsePlatform/xctoolchain.git
[submodule "Carthage/Checkouts/Bolts-iOS"]
path = Carthage/Checkouts/Bolts-iOS
url = https://github.com/BoltsFramework/Bolts-iOS.git
[submodule "Carthage/Checkouts/OCMock"]
path = Carthage/Checkouts/OCMock
url = https://github.com/erikdoe/OCMock.git
[submodule "Carthage/Checkouts/Bolts-ObjC"]
path = Carthage/Checkouts/Bolts-ObjC
url = https://github.com/BoltsFramework/Bolts-ObjC.git
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "BoltsFramework/Bolts-iOS" ~> 1.5
github "BoltsFramework/Bolts-ObjC" ~> 1.6
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "BoltsFramework/Bolts-iOS" "1.6.0"
github "erikdoe/OCMock" "v3.2"
github "BoltsFramework/Bolts-ObjC" "1.6.0"
github "erikdoe/OCMock" "v3.2.2"
0 Carthage/Checkouts/Bolts-iOS → Carthage/Checkouts/Bolts-ObjC
Open in desktop
Submodule Bolts-ObjC updated from 000000 to beac94
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OCMock
Open in desktop
Submodule OCMock updated 94 files
+1 −1 .travis.yml
+1 −0 CONTRIBUTING.md
+3 −2 OCMock.podspec
+15 −0 Source/Changes.txt
+274 −36 Source/OCMock.xcodeproj/project.pbxproj
+80 −0 Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock tvOS.xcscheme
+1 −1 Source/OCMock/NSInvocation+OCMAdditions.h
+60 −51 Source/OCMock/NSInvocation+OCMAdditions.m
+1 −1 Source/OCMock/NSMethodSignature+OCMAdditions.h
+1 −1 Source/OCMock/NSMethodSignature+OCMAdditions.m
+1 −1 Source/OCMock/NSNotificationCenter+OCMAdditions.h
+1 −1 Source/OCMock/NSNotificationCenter+OCMAdditions.m
+1 −1 Source/OCMock/NSObject+OCMAdditions.h
+1 −1 Source/OCMock/NSObject+OCMAdditions.m
+1 −1 Source/OCMock/NSValue+OCMAdditions.h
+1 −1 Source/OCMock/NSValue+OCMAdditions.m
+1 −1 Source/OCMock/OCClassMockObject.h
+12 −1 Source/OCMock/OCClassMockObject.m
+1 −1 Source/OCMock/OCMArg.h
+1 −1 Source/OCMock/OCMArg.m
+2 −2 Source/OCMock/OCMArgAction.h
+2 −2 Source/OCMock/OCMArgAction.m
+1 −1 Source/OCMock/OCMBlockArgCaller.h
+1 −1 Source/OCMock/OCMBlockArgCaller.m
+1 −1 Source/OCMock/OCMBlockCaller.h
+1 −1 Source/OCMock/OCMBlockCaller.m
+1 −1 Source/OCMock/OCMBoxedReturnValueProvider.h
+1 −1 Source/OCMock/OCMBoxedReturnValueProvider.m
+1 −1 Source/OCMock/OCMConstraint.h
+1 −1 Source/OCMock/OCMConstraint.m
+1 −1 Source/OCMock/OCMExceptionReturnValueProvider.h
+1 −1 Source/OCMock/OCMExceptionReturnValueProvider.m
+1 −1 Source/OCMock/OCMExpectationRecorder.h
+1 −1 Source/OCMock/OCMExpectationRecorder.m
+1 −1 Source/OCMock/OCMFunctions.h
+5 −1 Source/OCMock/OCMFunctions.m
+1 −1 Source/OCMock/OCMFunctionsPrivate.h
+1 −1 Source/OCMock/OCMIndirectReturnValueProvider.h
+1 −1 Source/OCMock/OCMIndirectReturnValueProvider.m
+1 −1 Source/OCMock/OCMInvocationExpectation.h
+1 −1 Source/OCMock/OCMInvocationExpectation.m
+1 −1 Source/OCMock/OCMInvocationMatcher.h
+3 −4 Source/OCMock/OCMInvocationMatcher.m
+1 −1 Source/OCMock/OCMInvocationStub.h
+24 −3 Source/OCMock/OCMInvocationStub.m
+1 −1 Source/OCMock/OCMLocation.h
+1 −1 Source/OCMock/OCMLocation.m
+1 −1 Source/OCMock/OCMMacroState.h
+1 −1 Source/OCMock/OCMMacroState.m
+1 −1 Source/OCMock/OCMNotificationPoster.h
+1 −1 Source/OCMock/OCMNotificationPoster.m
+4 −2 Source/OCMock/OCMObserverRecorder.h
+5 −3 Source/OCMock/OCMObserverRecorder.m
+1 −1 Source/OCMock/OCMPassByRefSetter.h
+9 −5 Source/OCMock/OCMPassByRefSetter.m
+1 −1 Source/OCMock/OCMRealObjectForwarder.h
+1 −1 Source/OCMock/OCMRealObjectForwarder.m
+1 −1 Source/OCMock/OCMRecorder.h
+1 −1 Source/OCMock/OCMRecorder.m
+1 −1 Source/OCMock/OCMReturnValueProvider.h
+1 −1 Source/OCMock/OCMReturnValueProvider.m
+1 −1 Source/OCMock/OCMStubRecorder.h
+1 −1 Source/OCMock/OCMStubRecorder.m
+1 −1 Source/OCMock/OCMVerifier.h
+1 −1 Source/OCMock/OCMVerifier.m
+1 −1 Source/OCMock/OCMock.h
+1 −1 Source/OCMock/OCMockObject.h
+2 −2 Source/OCMock/OCMockObject.m
+2 −2 Source/OCMock/OCObserverMockObject.h
+3 −3 Source/OCMock/OCObserverMockObject.m
+1 −1 Source/OCMock/OCPartialMockObject.h
+3 −1 Source/OCMock/OCPartialMockObject.m
+1 −1 Source/OCMock/OCProtocolMockObject.h
+1 −1 Source/OCMock/OCProtocolMockObject.m
+1 −1 Source/OCMockTests/NSInvocationOCMAdditionsTests.m
+1 −1 Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
+1 −1 Source/OCMockTests/OCMArgTests.m
+1 −1 Source/OCMockTests/OCMBoxedReturnValueProviderTests.m
+1 −1 Source/OCMockTests/OCMConstraintTests.m
+1 −1 Source/OCMockTests/OCMInvocationMatcherTests.m
+1 −1 Source/OCMockTests/OCMStubRecorderTests.m
+1 −1 Source/OCMockTests/OCMockObjectClassMethodMockingTests.m
+2 −2 Source/OCMockTests/OCMockObjectDynamicPropertyMockingTests.m
+1 −1 Source/OCMockTests/OCMockObjectForwardingTargetTests.m
+1 −1 Source/OCMockTests/OCMockObjectHamcrestTests.mm
+1 −1 Source/OCMockTests/OCMockObjectMacroTests.m
+1 −1 Source/OCMockTests/OCMockObjectPartialMocksTests.m
+1 −1 Source/OCMockTests/OCMockObjectProtocolMocksTests.m
+14 −1 Source/OCMockTests/OCMockObjectRuntimeTests.m
+67 −3 Source/OCMockTests/OCMockObjectTests.m
+1 −1 Source/OCMockTests/OCMockObjectVerifyAfterRunTests.m
+1 −1 Source/OCMockTests/OCObserverMockObjectTests.m
+51 −8 Tools/build.rb
+1 −1 Tools/updatebanner.rb
2 changes: 1 addition & 1 deletion Parse.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3414,7 +3414,7 @@
81EB6632198A7FA600851598 /* PFConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFConfig.h; sourceTree = "<group>"; };
81EB6633198A7FA600851598 /* PFConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFConfig.m; sourceTree = "<group>"; };
81EBF34B1B33E82200991947 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
81EC57761C34D0C4002DF851 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "Carthage/Checkouts/Bolts-iOS/Bolts.xcodeproj"; sourceTree = "<group>"; };
81EC57761C34D0C4002DF851 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = "<group>"; };
81EDD4D11B59A6EC002F69C0 /* PFCommandRunning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFCommandRunning.h; sourceTree = "<group>"; };
81EEE1AE1B446D600087AC4D /* PFCurrentUserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFCurrentUserController.h; sourceTree = "<group>"; };
81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFCurrentUserController.m; sourceTree = "<group>"; };
Expand Down
2 changes: 1 addition & 1 deletion Parse.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...t/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 1 addition & 1 deletion ...tarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 1 addition & 1 deletion ...Project/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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 ../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\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 ../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/ios/Bolts.framework .\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 1 addition & 1 deletion ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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 ../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\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 ../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/ios/Bolts.framework .\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 1 addition & 1 deletion ...tarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/tvOS/Bolts.framework .\nfi\n";
shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n ../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/tvOS/Bolts.framework .\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
2 changes: 1 addition & 1 deletion ...terProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "../../../Carthage/Checkouts/Bolts-iOS/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n\nif [[ ! -d \"Frameworks/iOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/iOS\n cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/ios/Bolts.framework ./Frameworks/iOS\nfi\n\nif [[ ! -d \"Frameworks/watchOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/watchOS\n cp -R ../../../Carthage/Checkouts/Bolts-iOS/build/watchOS/Bolts.framework ./Frameworks/watchOS\nfi\n";
shellScript = "../../../Carthage/Checkouts/Bolts-ObjC/scripts/build_framework.sh -n -c Release --with-watchos --with-tvos\n\nif [[ ! -d \"Frameworks/iOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/iOS\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/ios/Bolts.framework ./Frameworks/iOS\nfi\n\nif [[ ! -d \"Frameworks/watchOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/watchOS\n cp -R ../../../Carthage/Checkouts/Bolts-ObjC/build/watchOS/Bolts.framework ./Frameworks/watchOS\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ of patent rights can be found in the PATENTS file in the same directory.
[releases]: https://github.com/ParsePlatform/Parse-SDK-iOS-OSX/releases
[contributing]: https://github.com/ParsePlatform/Parse-SDK-iOS-OSX/blob/master/CONTRIBUTING.md

[bolts-framework]: https://github.com/BoltsFramework/Bolts-iOS
[bolts-framework]: https://github.com/BoltsFramework/Bolts-ObjC
[ocmock-framework]: http://ocmock.org

[build-status-svg]: https://img.shields.io/travis/ParsePlatform/Parse-SDK-iOS-OSX/master.svg
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_framework_task'
script_folder = File.expand_path(File.dirname(__FILE__))
build_folder = File.join(script_folder, 'build')
release_folder = File.join(build_folder, 'release')
bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-iOS')
bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC')
bolts_build_folder = File.join(bolts_folder, 'build')

module Constants
Expand Down