Merge pull request #7 from kevnm67/master

Fixed deprecations
belkevich · Feb 25, 2015 · 0c7b4dd · 0c7b4dd
2 parents 7c38c3a + ece0ac6
commit 0c7b4dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Pod/NSDate+Components.m b/Pod/NSDate+Components.m
@@ -14,44 +14,44 @@ @implementation NSDate (Components)
 
 - (NSDateComponents *)dateComponentsTime
 {
-    NSUInteger components = (NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit);
+    NSUInteger components = (NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond);
     return [self dateComponents:components];
 }
 
 - (NSDateComponents *)dateComponentsDate
 {
-    NSUInteger components = (NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit);
+    NSUInteger components = (NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear);
     return [self dateComponents:components];
 }
 
 - (NSDateComponents *)dateComponentsWeek
 {
-    NSUInteger components = (NSWeekCalendarUnit | NSWeekOfMonthCalendarUnit |
-                             NSWeekOfYearCalendarUnit | NSWeekdayCalendarUnit | NSYearCalendarUnit |
-                             NSYearForWeekOfYearCalendarUnit);
+    NSUInteger components = (NSCalendarUnitWeekday | NSCalendarUnitWeekOfMonth |
+                             NSCalendarUnitWeekOfYear | NSCalendarUnitWeekday | NSCalendarUnitYear |
+                             NSCalendarUnitYearForWeekOfYear);
     return [self dateComponents:components];
 }
 
 - (NSDateComponents *)dateComponentsWeekday
 {
-    NSUInteger components = (NSDayCalendarUnit | NSWeekCalendarUnit | NSWeekdayCalendarUnit |
-                             NSMonthCalendarUnit | NSYearCalendarUnit);
+    NSUInteger components = (NSCalendarUnitDay | NSCalendarUnitWeekday | NSCalendarUnitWeekday |
+                             NSCalendarUnitMonth | NSCalendarUnitYear);
     return [self dateComponents:components];
 }
 
 - (NSDateComponents *)dateComponentsDateTime
 {
-    NSUInteger components = (NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit |
-                             NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit);
+    NSUInteger components = (NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear |
+                             NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond);
     return [self dateComponents:components];
 }
 
 - (NSDateComponents *)dateComponentsWeekTime
 {
-    NSUInteger components = (NSWeekCalendarUnit | NSWeekdayCalendarUnit |
-                             NSWeekOfMonthCalendarUnit | NSWeekOfYearCalendarUnit |
-                             NSYearCalendarUnit | NSYearForWeekOfYearCalendarUnit |
-                             NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit);
+    NSUInteger components = (NSCalendarUnitWeekOfMonth | NSCalendarUnitWeekday |
+                             NSCalendarUnitWeekdayOrdinal | NSCalendarUnitWeekOfYear |
+                             NSCalendarUnitYear | NSCalendarUnitYearForWeekOfYear |
+                             NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond);
     return [self dateComponents:components];
 }
 

diff --git a/Pod/NSDate+Day.m b/Pod/NSDate+Day.m
@@ -19,7 +19,7 @@ - (NSInteger)day
 - (NSUInteger)daysInMonth
 {
     NSRange range = [[NSCalendar currentCalendar]
-                                 rangeOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit
+                                 rangeOfUnit:NSCalendarUnitDay inUnit:NSCalendarUnitMonth
                                      forDate:self];
     return range.length;
 }