From ece0ac67c4538d4168d99ef8e7a43887ea27350c Mon Sep 17 00:00:00 2001 From: Kevin Morton Date: Mon, 16 Feb 2015 16:20:37 -0500 Subject: [PATCH] Fixed deprecations --- Pod/NSDate+Components.m | 26 +++++++++++++------------- Pod/NSDate+Day.m | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Pod/NSDate+Components.m b/Pod/NSDate+Components.m index 4ff40ed..3ef2423 100644 --- 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 index 2d37d06..1f1bef2 100644 --- 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; }