Skip to content

Commit 58c502b

Browse files
committed
Merge pull request #69 from bojan/master
Xcode 6.3 compatibility fixes
2 parents 1b050b3 + c843d98 commit 58c502b

File tree

21 files changed

+65
-446
lines changed

21 files changed

+65
-446
lines changed

.gitignore

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,63 @@
1+
#####
2+
# OS X temporary files that should never be committed
3+
.DS_Store
4+
*.swp
5+
*.lock
6+
profile
17

2-
M13ProgressSuite.xcodeproj/xcuserdata/Hani.xcuserdatad/xcschemes/Documentation.xcscheme
8+
####
9+
# Xcode temporary files that should never be committed
10+
*~.nib
311

4-
M13ProgressSuite.xcodeproj/xcuserdata/Hani.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme
12+
####
13+
# Xcode build files
14+
DerivedData/
15+
build/
16+
Builds/
517

6-
M13ProgressSuite.xcodeproj/xcuserdata/Hani.xcuserdatad/xcschemes/xcschememanagement.plist
18+
#####
19+
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
20+
*.pbxuser
21+
*.mode1v3
22+
*.mode2v3
23+
*.perspectivev3
24+
!default.pbxuser
25+
!default.mode1v3
26+
!default.mode2v3
27+
!default.perspectivev3
728

8-
M13ProgressSuite.xcworkspace/xcshareddata/M13ProgressSuite.xccheckout
29+
####
30+
# Xcode 4 - semi-personal settings, often included in workspaces
31+
xcuserdata
932

10-
M13ProgressSuite.xcworkspace/xcuserdata/Hani.xcuserdatad/UserInterfaceState.xcuserstate
33+
####
34+
# XCode 4 workspaces - more detailed
35+
!xcshareddata
36+
!default.xcworkspace
37+
*.xcworkspacedata
38+
39+
####
40+
# XCode 4 build-schemes
41+
!xcschemes
42+
43+
####
44+
# Xcode 4 - Deprecated classes
45+
*.moved-aside
46+
47+
####
48+
# Xcode 5 - Source Control files
49+
*.xccheckout
50+
51+
####
52+
# AppCode
53+
.idea/
54+
55+
####
56+
# Other Xcode files
57+
profile
58+
*.hmap
59+
*.ipa
60+
61+
####
62+
# CocoaPods
63+
Pods/

Classes/ProgressViews/M13ProgressViewLetterpress.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ - (void)rotateWithDisplayLink:(CADisplayLink *)displayLink
231231
[view setTransform:CGAffineTransformMakeRotation(rotation * M_PI / 180)];
232232

233233
//If we are slowing down, animate to a new angle.
234-
if (fabsf(velocity) < 1) {
234+
if (fabs(velocity) < 1) {
235235
restRotation += (arc4random() & 2 ? 90 : -90);
236236
}
237237
}

Classes/ProgressViews/M13ProgressViewMetro.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ typedef enum {
3131
@param action The action to perform.
3232
@param animated Wether or not to animate the change*/
3333
- (void)performAction:(M13ProgressViewAction)action animated:(BOOL)animated;
34-
/**All subclasses must respond to NSCopying.*/
35-
- (id)copy;
3634

3735
@end
3836

M13ProgressSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

M13ProgressSuite.xcodeproj/project.xcworkspace/xcshareddata/M13ProgressSuite.xccheckout

Lines changed: 0 additions & 41 deletions
This file was deleted.
-46.3 KB
Binary file not shown.

M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/Documentation.xcscheme

Lines changed: 0 additions & 59 deletions
This file was deleted.

M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/M13ProgressSuite.xcscheme

Lines changed: 0 additions & 96 deletions
This file was deleted.

M13ProgressSuite.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 0 additions & 42 deletions
This file was deleted.

M13ProgressSuite.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)