Skip to content

Commit 9509b9e

Browse files
author
Matt York
committed
- Fixed warnings for NSCalendarUnits and NSCalendarIdentifier
- Bumped podspec
1 parent 47a5e1a commit 9509b9e

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎DateTools.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'DateTools'
3-
s.version = '1.4.1'
3+
s.version = '1.4.3'
44
s.summary = 'Dates and time made easy in Objective-C'
55
s.homepage = 'https://github.com/MatthewYork/DateTools'
66

@@ -10,9 +10,9 @@ Pod::Spec.new do |s|
1010
s.author = { "Matthew York" => "my3681@gmail.com" }
1111

1212
s.source = { :git => "https://github.com/MatthewYork/DateTools.git",
13-
:tag => "v1.4.1" }
13+
:tag => "v1.4.3" }
1414

15-
s.ios.platform = :ios, '6.0'
15+
s.ios.platform = :ios, '7.0'
1616
s.osx.platform = :iox, '10.7'
1717
s.requires_arc = true
1818

‎DateTools/NSDate+DateTools.m‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ typedef NS_ENUM(NSUInteger, DTDateComponent){
3939
DTDateComponentDayOfYear
4040
};
4141

42-
static const unsigned int allCalendarUnitFlags = NSYearCalendarUnit | NSQuarterCalendarUnit | NSMonthCalendarUnit | NSWeekOfYearCalendarUnit | NSWeekOfMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSEraCalendarUnit | NSWeekdayCalendarUnit | NSWeekdayOrdinalCalendarUnit | NSWeekOfYearCalendarUnit;
42+
static const unsigned int allCalendarUnitFlags = NSCalendarUnitYear | NSCalendarUnitQuarter | NSCalendarUnitMonth | NSCalendarUnitWeekOfYear | NSCalendarUnitWeekOfMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitEra | NSCalendarUnitWeekday | NSCalendarUnitWeekdayOrdinal | NSCalendarUnitWeekOfYear;
4343

4444
static NSString *defaultCalendarIdentifier = nil;
4545
static NSCalendar *implicitCalendar = nil;
4646

4747
@implementation NSDate (DateTools)
4848

4949
+ (void)load {
50-
[self setDefaultCalendarIdentifier:NSGregorianCalendar];
50+
[self setDefaultCalendarIdentifier:NSCalendarIdentifierGregorian];
5151
}
5252

5353
#pragma mark - Time Ago
@@ -104,7 +104,7 @@ - (NSString *)timeAgoSinceDate:(NSDate *)date{
104104
- (NSString *)timeAgoSinceDate:(NSDate *)date numericDates:(BOOL)useNumericDates{
105105

106106
NSCalendar *calendar = [NSCalendar currentCalendar];
107-
NSUInteger unitFlags = NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSWeekOfYearCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit | NSSecondCalendarUnit;
107+
NSUInteger unitFlags = NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitWeekOfYear | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitSecond;
108108
NSDate *earliest = [self earlierDate:date];
109109
NSDate *latest = (earliest == self) ? date : self;
110110
NSDateComponents *components = [calendar components:unitFlags fromDate:earliest toDate:latest options:0];
@@ -185,7 +185,7 @@ - (NSString *)shortTimeAgoSinceDate:(NSDate *)date{
185185
//use abbreviated unit names
186186

187187
NSCalendar *calendar = [NSCalendar currentCalendar];
188-
NSUInteger unitFlags = NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSWeekOfYearCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit | NSSecondCalendarUnit;
188+
NSUInteger unitFlags = NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitWeekOfYear | NSCalendarUnitMonth | NSCalendarUnitYear | NSCalendarUnitSecond;
189189
NSDate *earliest = [self earlierDate:date];
190190
NSDate *latest = (earliest == self) ? date : self;
191191
NSDateComponents *components = [calendar components:unitFlags fromDate:earliest toDate:latest options:0];
@@ -375,8 +375,8 @@ - (NSInteger)yearForWeekOfYear{
375375
*/
376376
- (NSInteger)daysInMonth{
377377
NSCalendar *calendar = [NSCalendar currentCalendar];
378-
NSRange days = [calendar rangeOfUnit:NSDayCalendarUnit
379-
inUnit:NSMonthCalendarUnit
378+
NSRange days = [calendar rangeOfUnit:NSCalendarUnitDay
379+
inUnit:NSCalendarUnitMonth
380380
forDate:self];
381381
return days.length;
382382
}
@@ -427,29 +427,29 @@ -(BOOL)isInLeapYear{
427427

428428
- (BOOL)isToday {
429429
NSCalendar *cal = [NSCalendar currentCalendar];
430-
NSDateComponents *components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:[NSDate date]];
430+
NSDateComponents *components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:[NSDate date]];
431431
NSDate *today = [cal dateFromComponents:components];
432-
components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:self];
432+
components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:self];
433433
NSDate *otherDate = [cal dateFromComponents:components];
434434

435435
return [today isEqualToDate:otherDate];
436436
}
437437

438438
- (BOOL)isTomorrow {
439439
NSCalendar *cal = [NSCalendar currentCalendar];
440-
NSDateComponents *components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:[[NSDate date] dateByAddingDays:1]];
440+
NSDateComponents *components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:[[NSDate date] dateByAddingDays:1]];
441441
NSDate *tomorrow = [cal dateFromComponents:components];
442-
components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:self];
442+
components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:self];
443443
NSDate *otherDate = [cal dateFromComponents:components];
444444

445445
return [tomorrow isEqualToDate:otherDate];
446446
}
447447

448448
-(BOOL)isYesterday{
449449
NSCalendar *cal = [NSCalendar currentCalendar];
450-
NSDateComponents *components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:[[NSDate date] dateBySubtractingDays:1]];
450+
NSDateComponents *components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:[[NSDate date] dateBySubtractingDays:1]];
451451
NSDate *tomorrow = [cal dateFromComponents:components];
452-
components = [cal components:(NSEraCalendarUnit|NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit) fromDate:self];
452+
components = [cal components:(NSCalendarUnitEra|NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay) fromDate:self];
453453
NSDate *otherDate = [cal dateFromComponents:components];
454454

455455
return [tomorrow isEqualToDate:otherDate];
@@ -628,7 +628,7 @@ -(NSInteger)componentForDate:(NSDate *)date type:(DTDateComponent)component cale
628628
unsigned int unitFlags = 0;
629629

630630
if (component == DTDateComponentYearForWeekOfYear) {
631-
unitFlags = NSYearCalendarUnit | NSQuarterCalendarUnit | NSMonthCalendarUnit | NSWeekOfYearCalendarUnit | NSWeekOfMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit | NSEraCalendarUnit | NSWeekdayCalendarUnit | NSWeekdayOrdinalCalendarUnit | NSWeekOfYearCalendarUnit | NSYearForWeekOfYearCalendarUnit;
631+
unitFlags = NSCalendarUnitYear | NSCalendarUnitQuarter | NSCalendarUnitMonth | NSCalendarUnitWeekOfYear | NSCalendarUnitWeekOfMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond | NSCalendarUnitEra | NSCalendarUnitWeekday | NSCalendarUnitWeekdayOrdinal | NSCalendarUnitWeekOfYear | NSCalendarUnitYearForWeekOfYear;
632632
}
633633
else {
634634
unitFlags = allCalendarUnitFlags;
@@ -664,7 +664,7 @@ -(NSInteger)componentForDate:(NSDate *)date type:(DTDateComponent)component cale
664664
case DTDateComponentYearForWeekOfYear:
665665
return [dateComponents yearForWeekOfYear];
666666
case DTDateComponentDayOfYear:
667-
return [calendar ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:date];
667+
return [calendar ordinalityOfUnit:NSCalendarUnitDay inUnit:NSCalendarUnitYear forDate:date];
668668
default:
669669
break;
670670
}
@@ -993,7 +993,7 @@ -(NSInteger)yearsFrom:(NSDate *)date calendar:(NSCalendar *)calendar{
993993
NSDate *earliest = [self earlierDate:date];
994994
NSDate *latest = (earliest == self) ? date : self;
995995
NSInteger multiplier = (earliest == self) ? -1 : 1;
996-
NSDateComponents *components = [calendar components:NSYearCalendarUnit fromDate:earliest toDate:latest options:0];
996+
NSDateComponents *components = [calendar components:NSCalendarUnitYear fromDate:earliest toDate:latest options:0];
997997
return multiplier*components.year;
998998
}
999999

@@ -1035,7 +1035,7 @@ -(NSInteger)weeksFrom:(NSDate *)date calendar:(NSCalendar *)calendar{
10351035
NSDate *earliest = [self earlierDate:date];
10361036
NSDate *latest = (earliest == self) ? date : self;
10371037
NSInteger multiplier = (earliest == self) ? -1 : 1;
1038-
NSDateComponents *components = [calendar components:NSWeekOfYearCalendarUnit fromDate:earliest toDate:latest options:0];
1038+
NSDateComponents *components = [calendar components:NSCalendarUnitWeekOfYear fromDate:earliest toDate:latest options:0];
10391039
return multiplier*components.weekOfYear;
10401040
}
10411041

@@ -1056,7 +1056,7 @@ -(NSInteger)daysFrom:(NSDate *)date calendar:(NSCalendar *)calendar{
10561056
NSDate *earliest = [self earlierDate:date];
10571057
NSDate *latest = (earliest == self) ? date : self;
10581058
NSInteger multiplier = (earliest == self) ? -1 : 1;
1059-
NSDateComponents *components = [calendar components:NSDayCalendarUnit fromDate:earliest toDate:latest options:0];
1059+
NSDateComponents *components = [calendar components:NSCalendarUnitDay fromDate:earliest toDate:latest options:0];
10601060
return multiplier*components.day;
10611061
}
10621062

@@ -1572,7 +1572,7 @@ +(NSString *)defaultCalendarIdentifier {
15721572
*/
15731573
+ (void)setDefaultCalendarIdentifier:(NSString *)identifier {
15741574
defaultCalendarIdentifier = [identifier copy];
1575-
implicitCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:defaultCalendarIdentifier ?: NSGregorianCalendar];
1575+
implicitCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:defaultCalendarIdentifier ?: NSCalendarIdentifierGregorian];
15761576
}
15771577

15781578
/**

‎Tests/DateToolsTests/DateToolsTests.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
427427
GCC_WARN_UNUSED_FUNCTION = YES;
428428
GCC_WARN_UNUSED_VARIABLE = YES;
429-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
429+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
430430
ONLY_ACTIVE_ARCH = YES;
431431
SDKROOT = iphoneos;
432432
};
@@ -458,7 +458,7 @@
458458
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
459459
GCC_WARN_UNUSED_FUNCTION = YES;
460460
GCC_WARN_UNUSED_VARIABLE = YES;
461-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
461+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
462462
SDKROOT = iphoneos;
463463
VALIDATE_PRODUCT = YES;
464464
};

0 commit comments

Comments
 (0)