File tree
21 files changed
+88
-83
lines changed- Carthage/Checkouts
- Parse
- Configurations
- Parse/Resources
- Parse.xcodeproj
- ParseFacebookUtils
- Configurations
- ParseFacebookUtils.xcodeproj
- Resources
- ParseStarterProject
- iOS
- ParseStarterProject/ParseStarterProject.xcodeproj
- ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj
- watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj
- ParseTwitterUtils
- Configurations
- ParseTwitterUtils.xcodeproj
- Resources
- ParseUI
- ParseUI.xcodeproj
- Resources
21 files changed
+88
-83
lines changedLines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + |
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + |
- .travis.yml+1-1
- Makefile+60-25
- OCMock.podspec+29-25
- Source/Carthage.xcconfig+20
- Source/Changes.txt+27
- Source/OCMock.xcodeproj/project.pbxproj+92-57
- Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock iOS.xcscheme+1-1
- Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock tvOS.xcscheme+1-1
- Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock watchOS.xcscheme+1-1
- Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock.xcscheme+10-11
- Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMockLib.xcscheme+1-1
- Source/OCMock/NSInvocation+OCMAdditions.h+1-5
- Source/OCMock/NSInvocation+OCMAdditions.m+41-64
- Source/OCMock/NSMethodSignature+OCMAdditions.m+1-1
- Source/OCMock/NSNotificationCenter+OCMAdditions.m+5
- Source/OCMock/NSObject+OCMAdditions.m+2-1
- Source/OCMock/NSValue+OCMAdditions.m+1
- Source/OCMock/OCClassMockObject.h+3-1
- Source/OCMock/OCClassMockObject.m+20-5
- Source/OCMock/OCMArg.m+4-3
- Source/OCMock/OCMBlockCaller.h-1
- Source/OCMock/OCMBoxedReturnValueProvider.m+6-4
- Source/OCMock/OCMConstraint.h-1
- Source/OCMock/OCMConstraint.m+3-2
- Source/OCMock/OCMExpectationRecorder.h+1-1
- Source/OCMock/OCMExpectationRecorder.m+2
- Source/OCMock/OCMFunctions.h+1
- Source/OCMock/OCMFunctions.m+97-55
- Source/OCMock/OCMFunctionsPrivate.h+1
- Source/OCMock/OCMInvocationMatcher.m+4-4
- Source/OCMock/OCMInvocationStub.m+17-2
- Source/OCMock/OCMLocation.h+1-2
- Source/OCMock/OCMLocation.m+1
- Source/OCMock/OCMMacroState.m+1-1
- Source/OCMock/OCMNonRetainingObjectReturnValueProvider.m+2-14
- Source/OCMock/OCMObserverRecorder.m+2-4
- Source/OCMock/OCMRealObjectForwarder.m+29-13
- Source/OCMock/OCMRecorder.m+2-2
- Source/OCMock/OCMStubRecorder.h+24
- Source/OCMock/OCMStubRecorder.m+34-10
- Source/OCMock/OCMVerifier.h+2-2
- Source/OCMock/OCMVerifier.m+1-1
- Source/OCMock/OCMock.h+1-136
- Source/OCMock/OCMockMacros.h+156
- Source/OCMock/OCMockObject.h+2-1
- Source/OCMock/OCMockObject.m+50-40
- Source/OCMock/OCObserverMockObject.h+1
- Source/OCMock/OCObserverMockObject.m+5-4
- Source/OCMock/OCPartialMockObject.h+2-1
- Source/OCMock/OCPartialMockObject.m+25-16
- Source/OCMock/OCProtocolMockObject.h+1-1
- Source/OCMock/OCProtocolMockObject.m+1-1
- Source/OCMock/en.lproj/InfoPlist.strings-2
- Source/OCMockCI.xcconfig+8
- Source/OCMockDist.xcconfig+15
- Source/OCMockLibTests/en.lproj/InfoPlist.strings-2
- Source/OCMockTests/NSInvocationOCMAdditionsTests.m+24
- Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m+1
- Source/OCMockTests/OCMBoxedReturnValueProviderTests.m+1
- Source/OCMockTests/OCMCPlusPlus11Tests.mm+1-1
- Source/OCMockTests/OCMCPlusPlus98Tests.mm+1-1
- Source/OCMockTests/OCMConstraintTests.m+1-1
- Source/OCMockTests/OCMFunctionsTests.m+96
- Source/OCMockTests/OCMInvocationMatcherTests.m+1-2
- Source/OCMockTests/OCMNoEscapeBlockTests.m+2-1
- Source/OCMockTests/OCMQuantifierTests.m+19-2
- Source/OCMockTests/OCMStubRecorderTests.m+2-3
- Source/OCMockTests/OCMockObjectClassMethodMockingTests.m+1-1
- Source/OCMockTests/OCMockObjectDynamicPropertyMockingTests.m+2-1
- Source/OCMockTests/OCMockObjectForwardingTargetTests.m+2-1
- Source/OCMockTests/OCMockObjectHamcrestTests.m+1-1
- Source/OCMockTests/OCMockObjectInternalTests.m+1-1
- Source/OCMockTests/OCMockObjectMacroTests.m+57-22
- Source/OCMockTests/OCMockObjectPartialMocksTests.m+132-56
- Source/OCMockTests/OCMockObjectProtocolMocksTests.m+1-1
- Source/OCMockTests/OCMockObjectRuntimeTests.m+284-1
- Source/OCMockTests/OCMockObjectTests.m+65-7
- Source/OCMockTests/OCMockObjectVerifyAfterRunTests.m+2-2
- Source/OCMockTests/OCObserverMockObjectTests.m+6-2
- Source/OCMockTests/TestClassWithCustomReferenceCounting.m+5-3
- Source/OCMockTests/en.lproj/InfoPlist.strings-2
- Tools/build.rb-230
- Tools/buildcheck.rb+55
- Tools/makedmg.rb+44
Lines changed: 6 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 |
| - | |
| 13 | + | |
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
| |||
85 | 85 |
| |
86 | 86 |
| |
87 | 87 |
| |
88 |
| - | |
| 88 | + | |
89 | 89 |
| |
90 | 90 |
| |
91 | 91 |
| |
| |||
104 | 104 |
| |
105 | 105 |
| |
106 | 106 |
| |
107 |
| - | |
| 107 | + | |
108 | 108 |
| |
109 | 109 |
| |
110 | 110 |
| |
| |||
126 | 126 |
| |
127 | 127 |
| |
128 | 128 |
| |
129 |
| - | |
130 |
| - | |
| 129 | + | |
| 130 | + | |
131 | 131 |
| |
132 | 132 |
| |
133 | 133 |
| |
| |||
153 | 153 |
| |
154 | 154 |
| |
155 | 155 |
| |
156 |
| - | |
| 156 | + | |
157 | 157 |
| |
158 | 158 |
| |
159 | 159 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
| 16 | + | |
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
19 |
| - | |
| 19 | + | |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
|
Lines changed: 35 additions & 18 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
25 |
| - | |
26 | 25 |
| |
27 | 26 |
| |
28 | 27 |
| |
| |||
1151 | 1150 |
| |
1152 | 1151 |
| |
1153 | 1152 |
| |
1154 |
| - | |
1155 | 1153 |
| |
1156 | 1154 |
| |
1157 | 1155 |
| |
| |||
2509 | 2507 |
| |
2510 | 2508 |
| |
2511 | 2509 |
| |
2512 |
| - | |
2513 | 2510 |
| |
2514 | 2511 |
| |
2515 | 2512 |
| |
| |||
2640 | 2637 |
| |
2641 | 2638 |
| |
2642 | 2639 |
| |
2643 |
| - | |
2644 |
| - | |
2645 |
| - | |
| 2640 | + | |
| 2641 | + | |
2646 | 2642 |
| |
2647 | 2643 |
| |
2648 | 2644 |
| |
| |||
2982 | 2978 |
| |
2983 | 2979 |
| |
2984 | 2980 |
| |
| 2981 | + | |
| 2982 | + | |
| 2983 | + | |
| 2984 | + | |
| 2985 | + | |
| 2986 | + | |
| 2987 | + | |
2985 | 2988 |
| |
2986 | 2989 |
| |
2987 | 2990 |
| |
| |||
3538 | 3541 |
| |
3539 | 3542 |
| |
3540 | 3543 |
| |
| 3544 | + | |
| 3545 | + | |
3541 | 3546 |
| |
3542 | 3547 |
| |
3543 | 3548 |
| |
| |||
3623 | 3628 |
| |
3624 | 3629 |
| |
3625 | 3630 |
| |
| 3631 | + | |
3626 | 3632 |
| |
3627 | 3633 |
| |
3628 | 3634 |
| |
3629 | 3635 |
| |
3630 | 3636 |
| |
3631 | 3637 |
| |
3632 |
| - | |
3633 | 3638 |
| |
3634 | 3639 |
| |
3635 | 3640 |
| |
| |||
3647 | 3652 |
| |
3648 | 3653 |
| |
3649 | 3654 |
| |
3650 |
| - | |
3651 | 3655 |
| |
3652 | 3656 |
| |
3653 | 3657 |
| |
3654 | 3658 |
| |
3655 | 3659 |
| |
3656 | 3660 |
| |
3657 | 3661 |
| |
3658 |
| - | |
3659 | 3662 |
| |
3660 | 3663 |
| |
3661 | 3664 |
| |
3662 | 3665 |
| |
3663 | 3666 |
| |
3664 | 3667 |
| |
3665 | 3668 |
| |
3666 |
| - | |
3667 | 3669 |
| |
3668 | 3670 |
| |
3669 | 3671 |
| |
3670 | 3672 |
| |
3671 | 3673 |
| |
3672 | 3674 |
| |
3673 | 3675 |
| |
3674 |
| - | |
3675 | 3676 |
| |
3676 | 3677 |
| |
3677 | 3678 |
| |
3678 | 3679 |
| |
3679 | 3680 |
| |
3680 | 3681 |
| |
3681 | 3682 |
| |
3682 |
| - | |
| 3683 | + | |
3683 | 3684 |
| |
3684 | 3685 |
| |
3685 | 3686 |
| |
| |||
3908 | 3909 |
| |
3909 | 3910 |
| |
3910 | 3911 |
| |
| 3912 | + | |
| 3913 | + | |
3911 | 3914 |
| |
3912 | 3915 |
| |
3913 | 3916 |
| |
| |||
6914 | 6917 |
| |
6915 | 6918 |
| |
6916 | 6919 |
| |
| 6920 | + | |
6917 | 6921 |
| |
6918 | 6922 |
| |
6919 | 6923 |
| |
| |||
8758 | 8762 |
| |
8759 | 8763 |
| |
8760 | 8764 |
| |
| 8765 | + | |
8761 | 8766 |
| |
8762 | 8767 |
| |
8763 | 8768 |
| |
| |||
8780 | 8785 |
| |
8781 | 8786 |
| |
8782 | 8787 |
| |
| 8788 | + | |
8783 | 8789 |
| |
8784 | 8790 |
| |
| 8791 | + | |
| 8792 | + | |
| 8793 | + | |
| 8794 | + | |
| 8795 | + | |
8785 | 8796 |
| |
8786 | 8797 |
| |
8787 | 8798 |
| |
| |||
8808 | 8819 |
| |
8809 | 8820 |
| |
8810 | 8821 |
| |
8811 |
| - | |
| 8822 | + | |
8812 | 8823 |
| |
8813 | 8824 |
| |
8814 | 8825 |
| |
| |||
8825 | 8836 |
| |
8826 | 8837 |
| |
8827 | 8838 |
| |
8828 |
| - | |
| 8839 | + | |
8829 | 8840 |
| |
8830 | 8841 |
| |
8831 | 8842 |
| |
| |||
8880 | 8891 |
| |
8881 | 8892 |
| |
8882 | 8893 |
| |
8883 |
| - | |
| 8894 | + | |
8884 | 8895 |
| |
8885 | 8896 |
| |
8886 | 8897 |
| |
| |||
8937 | 8948 |
| |
8938 | 8949 |
| |
8939 | 8950 |
| |
8940 |
| - | |
| 8951 | + | |
8941 | 8952 |
| |
8942 | 8953 |
| |
8943 | 8954 |
| |
| |||
8971 | 8982 |
| |
8972 | 8983 |
| |
8973 | 8984 |
| |
| 8985 | + | |
8974 | 8986 |
| |
8975 | 8987 |
| |
8976 | 8988 |
| |
8977 | 8989 |
| |
8978 | 8990 |
| |
8979 | 8991 |
| |
8980 | 8992 |
| |
| 8993 | + | |
8981 | 8994 |
| |
8982 | 8995 |
| |
8983 | 8996 |
| |
| |||
9029 | 9042 |
| |
9030 | 9043 |
| |
9031 | 9044 |
| |
9032 |
| - | |
| 9045 | + | |
9033 | 9046 |
| |
9034 | 9047 |
| |
9035 | 9048 |
| |
| |||
9048 | 9061 |
| |
9049 | 9062 |
| |
9050 | 9063 |
| |
9051 |
| - | |
| 9064 | + | |
9052 | 9065 |
| |
9053 | 9066 |
| |
9054 | 9067 |
| |
| |||
9065 | 9078 |
| |
9066 | 9079 |
| |
9067 | 9080 |
| |
| 9081 | + | |
9068 | 9082 |
| |
9069 | 9083 |
| |
9070 | 9084 |
| |
| |||
9075 | 9089 |
| |
9076 | 9090 |
| |
9077 | 9091 |
| |
| 9092 | + | |
9078 | 9093 |
| |
9079 | 9094 |
| |
9080 | 9095 |
| |
| |||
9085 | 9100 |
| |
9086 | 9101 |
| |
9087 | 9102 |
| |
| 9103 | + | |
9088 | 9104 |
| |
9089 | 9105 |
| |
9090 | 9106 |
| |
| |||
9093 | 9109 |
| |
9094 | 9110 |
| |
9095 | 9111 |
| |
| 9112 | + | |
9096 | 9113 |
| |
9097 | 9114 |
| |
9098 | 9115 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
| 26 | + | |
27 | 27 |
| |
28 | 28 |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
| 16 | + | |
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
|
0 commit comments