Merge pull request ZipArchive#119 from liufan321/master

Change CalendarUnits for iOS 8.0
minsifansi · Oct 27, 2014 · 874ebd8 · 874ebd8
2 parents 60f577a + a8f065f
commit 874ebd8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m
@@ -378,7 +378,11 @@ - (BOOL)open {
 
 - (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date {
     NSCalendar *currentCalendar = [NSCalendar currentCalendar];
+#ifdef __IPHONE_8_0
+    uint flags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+#else
     uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
+#endif
     NSDateComponents *components = [currentCalendar components:flags fromDate:date];
     zipInfo->tmz_date.tm_sec = (unsigned int)components.second;
     zipInfo->tmz_date.tm_min = (unsigned int)components.minute;
@@ -506,7 +510,11 @@ + (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime {
 	static NSCalendar *gregorian;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+#ifdef __IPHONE_8_0
+		gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+#else
+        gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+#endif
 	});
 
     NSDateComponents *components = [[NSDateComponents alloc] init];