From 845726653ee2d0e9b6b7dd47760c620ce1ebb5e3 Mon Sep 17 00:00:00 2001 From: arida Date: Tue, 20 Mar 2018 11:16:42 +0800 Subject: [PATCH] 1. Update GBCommentsProcessor, fix GBEnumConstantData instance execute `matchesObject` method crash issue. 2. Use Cocoapods 1.2.0 install. 3. Specific `Minizip/minishared` commit id. 4. fix AppledocTests linking error. --- Podfile | 2 +- Podfile.lock | 11 +- Pods/GHUnit/Classes-MacOSX/UI/GHTestApp.m | 2 +- .../UI/GHTestOutlineViewModel.m | 8 +- Pods/GHUnit/Classes/GHAsyncTestCase.m | 8 +- Pods/GHUnit/Classes/GHTest/GHTest.m | 3 +- .../Classes/GHTest/GHTestGroup+JUnitXML.m | 4 +- Pods/GHUnit/Classes/GHTest/GHTestGroup.m | 4 +- Pods/GHUnit/Classes/GHTest/GHTestRunner.m | 23 +- Pods/GHUnit/Classes/GHTest/GHTestSuite.m | 6 +- Pods/GHUnit/Classes/GHTest/GHTesting.m | 8 +- .../NSException+GHTestFailureExceptions.m | 12 +- Pods/GHUnit/Classes/GHTestUtils.m | 2 +- .../Classes/Mock/GHMockNSURLConnection.m | 8 +- .../GHUnit/Classes/SharedUI/GHTestViewModel.h | 4 +- .../GHUnit/Classes/SharedUI/GHTestViewModel.m | 24 +- Pods/GHUnit/LICENSE | 4 +- Pods/GHUnit/README.md | 100 ++-- Pods/Manifest.lock | 11 +- Pods/Pods.xcodeproj/project.pbxproj | 479 +++++++----------- ...ds-AppledocTests-acknowledgements.markdown | 4 +- .../Pods-AppledocTests-acknowledgements.plist | 4 +- .../Pods-AppledocTests-frameworks.sh | 15 +- .../Pods-AppledocTests-resources.sh | 37 +- .../Pods-AppledocTests.debug.xcconfig | 1 - .../Pods-AppledocTests.release.xcconfig | 1 - .../Pods-appledoc/Pods-appledoc-frameworks.sh | 15 +- .../Pods-appledoc/Pods-appledoc-resources.sh | 25 +- .../Pods-appledoc.debug.xcconfig | 1 - .../Pods-appledoc.release.xcconfig | 1 - Processing/GBCommentsProcessor.m | 2 + appledoc.xcodeproj/project.pbxproj | 10 +- 32 files changed, 378 insertions(+), 461 deletions(-) diff --git a/Podfile b/Podfile index 119f796a..ff9b693a 100644 --- a/Podfile +++ b/Podfile @@ -7,7 +7,7 @@ def default_pods # Discount '2.1.5a' with configure and make pod 'Discount', :podspec => 'Specs/Discount.podspec' pod 'GRMustache', '~> 7.0.2' - pod 'Minizip/minishared', :git => 'https://github.com/nmoinvaz/minizip.git' + pod 'Minizip/minishared', :git => 'https://github.com/nmoinvaz/minizip.git', :commit => 'c6d04f9c642a730a4d5a295b811ec884b4fe3ba2' pod 'DDMinizip', :podspec => 'Specs/DDMinizip.podspec' end diff --git a/Podfile.lock b/Podfile.lock index e86c6852..18e10c6d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,7 @@ PODS: - DDMinizip (1.0.0.2017.06.25) - Discount (2.1.5a) - - GHUnit (0.5.8) + - GHUnit (0.6.0) - GRMustache (7.0.2): - JRSwizzle (~> 1.0) - JRSwizzle (1.0) @@ -18,7 +18,7 @@ DEPENDENCIES: - Discount (from `Specs/Discount.podspec`) - GHUnit (~> 0.5) - GRMustache (~> 7.0.2) - - Minizip/minishared (from `https://github.com/nmoinvaz/minizip.git`) + - Minizip/minishared (from `https://github.com/nmoinvaz/minizip.git`, commit `c6d04f9c642a730a4d5a295b811ec884b4fe3ba2`) - OCMock (~> 3.4) - ParseKit (from `Specs/ParseKit.podspec`) - RegexKitLite (from `https://github.com/inquisitiveSoft/RegexKitLite.git`) @@ -29,6 +29,7 @@ EXTERNAL SOURCES: Discount: :podspec: Specs/Discount.podspec Minizip: + :commit: c6d04f9c642a730a4d5a295b811ec884b4fe3ba2 :git: https://github.com/nmoinvaz/minizip.git ParseKit: :podspec: Specs/ParseKit.podspec @@ -49,7 +50,7 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: DDMinizip: 83ed28588afe79b164907317610e3862ad494d75 Discount: 2a100efef8ec69e3c59a9ab5a20cdec3d179e93c - GHUnit: 07609b0386af75f20ce520277d1c24fd8cd1598e + GHUnit: 327085549049e5a5f5f317a1e240a0ced5482f44 GRMustache: a724bfb0ac23c8f88a6388df9c7d73bc26e7005c JRSwizzle: dd5ead5d913a0f29e7f558200165849f006bb1e3 Minizip: b7213b5711d7c8961326f15f6c22fc9947950dd8 @@ -57,6 +58,6 @@ SPEC CHECKSUMS: ParseKit: 92f20b0017e23dd3c418e648169a13b8aa26bc24 RegexKitLite: 185a6b9d126b14e3e1f4df7570a50a3b3e27a036 -PODFILE CHECKSUM: 504b2e21b6ab7feca9cc228effa83eacae7055bb +PODFILE CHECKSUM: 5f639104b7222508b4011f84b974bcd6a4e03709 -COCOAPODS: 1.3.0.beta.2 +COCOAPODS: 1.2.0 diff --git a/Pods/GHUnit/Classes-MacOSX/UI/GHTestApp.m b/Pods/GHUnit/Classes-MacOSX/UI/GHTestApp.m index 9a1cb63c..3fff9c41 100644 --- a/Pods/GHUnit/Classes-MacOSX/UI/GHTestApp.m +++ b/Pods/GHUnit/Classes-MacOSX/UI/GHTestApp.m @@ -15,7 +15,7 @@ - (id)init { windowController_ = [[GHTestWindowController alloc] init]; NSBundle *bundle = [NSBundle bundleForClass:[self class]]; topLevelObjects_ = [[NSMutableArray alloc] init]; - NSDictionary *externalNameTable = [NSDictionary dictionaryWithObjectsAndKeys:self, @"NSOwner", topLevelObjects_, @"NSTopLevelObjects", nil]; + NSDictionary *externalNameTable = @{@"NSOwner": self, @"NSTopLevelObjects": topLevelObjects_}; [bundle loadNibFile:@"GHTestApp" externalNameTable:externalNameTable withZone:nil]; } return self; diff --git a/Pods/GHUnit/Classes-MacOSX/UI/GHTestOutlineViewModel.m b/Pods/GHUnit/Classes-MacOSX/UI/GHTestOutlineViewModel.m index b5f0b12a..f930def8 100644 --- a/Pods/GHUnit/Classes-MacOSX/UI/GHTestOutlineViewModel.m +++ b/Pods/GHUnit/Classes-MacOSX/UI/GHTestOutlineViewModel.m @@ -18,7 +18,7 @@ - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id if (!item) { return [self root]; } else { - return [[item children] objectAtIndex:index]; + return [item children][index]; } } @@ -63,10 +63,8 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTab if (self.isEditing) { [cell setState:[item isSelected] ? NSOnState : NSOffState]; - NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys: - textColor, NSForegroundColorAttributeName, - [cell font], NSFontAttributeName, - nil]; + NSDictionary *attributes = @{NSForegroundColorAttributeName: textColor, + NSFontAttributeName: [cell font]}; NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:[item name] attributes:attributes]; [cell setAttributedTitle:attributedString]; diff --git a/Pods/GHUnit/Classes/GHAsyncTestCase.m b/Pods/GHUnit/Classes/GHAsyncTestCase.m index 76714012..f19d0a01 100644 --- a/Pods/GHUnit/Classes/GHAsyncTestCase.m +++ b/Pods/GHUnit/Classes/GHAsyncTestCase.m @@ -76,14 +76,14 @@ - (GHUnitAsyncError)_waitFor:(NSInteger)status timeout:(NSTimeInterval)timeout { waitForStatus_ = status; if (!_runLoopModes) - _runLoopModes = [NSArray arrayWithObjects:NSDefaultRunLoopMode, NSRunLoopCommonModes, nil]; + _runLoopModes = @[NSDefaultRunLoopMode, NSRunLoopCommonModes]; NSTimeInterval checkEveryInterval = 0.05; NSDate *runUntilDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; BOOL timedOut = NO; NSInteger runIndex = 0; while(notifiedStatus_ == kGHUnitWaitStatusUnknown) { - NSString *mode = [_runLoopModes objectAtIndex:(runIndex++ % [_runLoopModes count])]; + NSString *mode = _runLoopModes[(runIndex++ % [_runLoopModes count])]; [lock_ unlock]; @autoreleasepool { @@ -139,12 +139,12 @@ - (void)runForInterval:(NSTimeInterval)interval { NSDate *runUntilDate = [NSDate dateWithTimeIntervalSinceNow:interval]; if (!_runLoopModes) - _runLoopModes = [NSArray arrayWithObjects:NSDefaultRunLoopMode, NSRunLoopCommonModes, nil]; + _runLoopModes = @[NSDefaultRunLoopMode, NSRunLoopCommonModes]; NSInteger runIndex = 0; while ([runUntilDate compare:[NSDate dateWithTimeIntervalSinceNow:0]] == NSOrderedDescending) { - NSString *mode = [_runLoopModes objectAtIndex:(runIndex++ % [_runLoopModes count])]; + NSString *mode = _runLoopModes[(runIndex++ % [_runLoopModes count])]; [lock_ unlock]; @autoreleasepool { diff --git a/Pods/GHUnit/Classes/GHTest/GHTest.m b/Pods/GHUnit/Classes/GHTest/GHTest.m index 6a4d3089..fb8842ee 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTest.m +++ b/Pods/GHUnit/Classes/GHTest/GHTest.m @@ -64,8 +64,7 @@ GHTestStats GHTestStatsMake(NSInteger succeedCount, NSInteger failureCount, NSIn const GHTestStats GHTestStatsEmpty = {0, 0, 0, 0}; NSString *NSStringFromGHTestStats(GHTestStats stats) { - return [NSString stringWithFormat:@"%d/%d/%d/%d", stats.succeedCount, stats.failureCount, - stats.cancelCount, stats.testCount]; + return [NSString stringWithFormat:@"%@/%@/%@/%@", @(stats.succeedCount), @(stats.failureCount), @(stats.cancelCount), @(stats.testCount)]; } BOOL GHTestStatusIsRunning(GHTestStatus status) { diff --git a/Pods/GHUnit/Classes/GHTest/GHTestGroup+JUnitXML.m b/Pods/GHUnit/Classes/GHTest/GHTestGroup+JUnitXML.m index 183d0a5a..e078d0f1 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTestGroup+JUnitXML.m +++ b/Pods/GHUnit/Classes/GHTest/GHTestGroup+JUnitXML.m @@ -48,8 +48,8 @@ - (BOOL)writeJUnitXMLAtPath:(NSString *)path error:(NSError **)error { - (NSString *)JUnitXML { NSMutableString *JUnitXML = [NSMutableString stringWithFormat: - @"", - self.name, self.stats.testCount, self.stats.failureCount, self.interval]; + @"", + self.name, @(self.stats.testCount), @(self.stats.failureCount), self.interval]; for (id child in self.children) { if ([child respondsToSelector:@selector(JUnitXML)]) diff --git a/Pods/GHUnit/Classes/GHTest/GHTestGroup.m b/Pods/GHUnit/Classes/GHTest/GHTestGroup.m index 29dfeb36..5a160bab 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTestGroup.m +++ b/Pods/GHUnit/Classes/GHTest/GHTestGroup.m @@ -81,8 +81,8 @@ - (void)dealloc { } - (NSString *)description { - return [NSString stringWithFormat:@"%@, %d %0.3f %d/%d (%d failures)", - name_, status_, interval_, stats_.succeedCount, stats_.testCount, stats_.failureCount]; + return [NSString stringWithFormat:@"%@, %d %0.3f %@/%@ (%@ failures)", + name_, status_, interval_, @(stats_.succeedCount), @(stats_.testCount), @(stats_.failureCount)]; } - (NSString *)name { diff --git a/Pods/GHUnit/Classes/GHTest/GHTestRunner.m b/Pods/GHUnit/Classes/GHTest/GHTestRunner.m index 9842c66c..dc18b563 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTestRunner.m +++ b/Pods/GHUnit/Classes/GHTest/GHTestRunner.m @@ -252,22 +252,25 @@ - (void)_notifyCancelled { - (void)_notifyFinished { NSString *message = [NSString stringWithFormat:@"Test Suite '%@' finished.\n" - "Executed %d of %d tests, with %d failures in %0.3f seconds (%d disabled).\n", + "Executed %@ of %@ tests, with %@ failures in %0.3f seconds (%@ disabled).\n", [test_ name], - ([test_ stats].succeedCount + [test_ stats].failureCount), - [test_ stats].testCount, - [test_ stats].failureCount, + @([test_ stats].succeedCount + [test_ stats].failureCount), + @([test_ stats].testCount), + @([test_ stats].failureCount), [test_ interval], - [test_ disabledCount]]; + @([test_ disabledCount])]; [self log:message]; if ([test_ isKindOfClass:[GHTestGroup class]]) { GHTestGroup *testGroup = (GHTestGroup *)test_; - [self log:@"\nFailed tests:\n"]; - for(id test in [testGroup failedTests]) { - [self log:[NSString stringWithFormat:@"\t%@\n", [test identifier]]]; + NSArray *failedTests = [testGroup failedTests]; + if ([failedTests count] > 0) { + [self log:@"\nFailed tests:\n"]; + for(id test in failedTests) { + [self log:[NSString stringWithFormat:@"\t%@\n", [test identifier]]]; + } + [self log:@"\n"]; } - [self log:@"\n"]; } if ([test_ isKindOfClass:[GHTestSuite class]]) { @@ -281,7 +284,7 @@ - (void)_notifyFinished { char *resultsDirStr = getenv("JUNIT_XML_DIR"); if (resultsDirStr) { - resultsDir = [NSString stringWithUTF8String:resultsDirStr]; + resultsDir = @(resultsDirStr); } else { NSString *tmpDir = NSTemporaryDirectory(); resultsDir = [tmpDir stringByAppendingPathComponent:@"test-results"]; diff --git a/Pods/GHUnit/Classes/GHTest/GHTestSuite.m b/Pods/GHUnit/Classes/GHTest/GHTestSuite.m index 3012bdb0..f8d1c49f 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTestSuite.m +++ b/Pods/GHUnit/Classes/GHTest/GHTestSuite.m @@ -96,14 +96,14 @@ + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilterString { for(NSString *testFilter in testFilters) { NSArray *components = [testFilter componentsSeparatedByString:@"/"]; if ([components count] == 2) { - NSString *testCaseClassName = [components objectAtIndex:0]; + NSString *testCaseClassName = components[0]; Class testCaseClass = NSClassFromString(testCaseClassName); id testCase = [[testCaseClass alloc] init]; if (!testCase) { NSLog(@"Couldn't find test: %@", testCaseClassName); continue; } - NSString *methodName = [components objectAtIndex:1]; + NSString *methodName = components[1]; GHTestGroup *group = [[GHTestGroup alloc] initWithTestCase:testCase selector:NSSelectorFromString(methodName) delegate:nil]; [testSuite addTestGroup:group]; } else { @@ -123,7 +123,7 @@ + (GHTestSuite *)suiteWithTestFilter:(NSString *)testFilterString { + (GHTestSuite *)suiteFromEnv { const char* cTestFilter = getenv("TEST"); if (cTestFilter) { - NSString *testFilter = [NSString stringWithUTF8String:cTestFilter]; + NSString *testFilter = @(cTestFilter); return [GHTestSuite suiteWithTestFilter:testFilter]; } else { if (GHUnitTest != NULL) return [GHTestSuite suiteWithTestFilter:GHUnitTest]; diff --git a/Pods/GHUnit/Classes/GHTest/GHTesting.m b/Pods/GHUnit/Classes/GHTest/GHTesting.m index e3aab445..e19dda44 100644 --- a/Pods/GHUnit/Classes/GHTest/GHTesting.m +++ b/Pods/GHUnit/Classes/GHTest/GHTesting.m @@ -130,9 +130,9 @@ - (void)registerClassName:(NSString *)className { } + (NSString *)descriptionForException:(NSException *)exception { - NSNumber *lineNumber = [[exception userInfo] objectForKey:GHTestLineNumberKey]; + NSNumber *lineNumber = [exception userInfo][GHTestLineNumberKey]; NSString *lineDescription = (lineNumber ? [lineNumber description] : @"Unknown"); - NSString *filename = [[[[exception userInfo] objectForKey:GHTestFilenameKey] stringByStandardizingPath] stringByAbbreviatingWithTildeInPath]; + NSString *filename = [[[exception userInfo][GHTestFilenameKey] stringByStandardizingPath] stringByAbbreviatingWithTildeInPath]; NSString *filenameDescription = (filename ? filename : @"Unknown"); return [NSString stringWithFormat:@"\n\tName: %@\n\tFile: %@\n\tLine: %@\n\tReason: %@\n\n%@", @@ -144,11 +144,11 @@ + (NSString *)descriptionForException:(NSException *)exception { } + (NSString *)exceptionFilenameForTest:(id)test { - return [[[[[test exception] userInfo] objectForKey:GHTestFilenameKey] stringByStandardizingPath] stringByAbbreviatingWithTildeInPath]; + return [[[[test exception] userInfo][GHTestFilenameKey] stringByStandardizingPath] stringByAbbreviatingWithTildeInPath]; } + (NSInteger)exceptionLineNumberForTest:(id)test { - return [[[[test exception] userInfo] objectForKey:GHTestLineNumberKey] integerValue]; + return [[[test exception] userInfo][GHTestLineNumberKey] integerValue]; } diff --git a/Pods/GHUnit/Classes/GHTest/NSException+GHTestFailureExceptions.m b/Pods/GHUnit/Classes/GHTest/NSException+GHTestFailureExceptions.m index 7e1bd4ac..fd0e32aa 100644 --- a/Pods/GHUnit/Classes/GHTest/NSException+GHTestFailureExceptions.m +++ b/Pods/GHUnit/Classes/GHTest/NSException+GHTestFailureExceptions.m @@ -70,10 +70,8 @@ + (NSException *)ghu_failureInFile:(NSString *)filename atLine:(int)lineNumber reason:(NSString *)reason { NSDictionary *userInfo = - [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInteger:lineNumber], GHTestLineNumberKey, - filename, GHTestFilenameKey, - nil]; + @{GHTestLineNumberKey: @(lineNumber), + GHTestFilenameKey: filename}; return [self exceptionWithName:GHTestFailureException reason:reason @@ -249,10 +247,8 @@ + (NSException *)ghu_failureWithName:(NSString *)name atLine:(int)lineNumber reason:(NSString *)reason { NSDictionary *userInfo = - [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInteger:lineNumber], GHTestLineNumberKey, - filename, GHTestFilenameKey, - nil]; + @{GHTestLineNumberKey: @(lineNumber), + GHTestFilenameKey: filename}; return [self exceptionWithName:name reason:reason diff --git a/Pods/GHUnit/Classes/GHTestUtils.m b/Pods/GHUnit/Classes/GHTestUtils.m index 4ea950c0..cf9ffa22 100644 --- a/Pods/GHUnit/Classes/GHTestUtils.m +++ b/Pods/GHUnit/Classes/GHTestUtils.m @@ -39,7 +39,7 @@ void GHRunForInterval(CFTimeInterval interval) { NSArray *runLoopModes = @[(NSString *)kCFRunLoopDefaultMode, (NSString *)kCFRunLoopCommonModes]; NSInteger runIndex = 0; while (CACurrentMediaTime() < runUntilTime) { - NSString *mode = [runLoopModes objectAtIndex:(runIndex++ % [runLoopModes count])]; + NSString *mode = runLoopModes[(runIndex++ % [runLoopModes count])]; @autoreleasepool { SInt32 runLoopStatus = CFRunLoopRunInMode((__bridge CFStringRef)mode, checkEveryInterval, false); if (!mode || (runLoopStatus == kCFRunLoopRunFinished)) { diff --git a/Pods/GHUnit/Classes/Mock/GHMockNSURLConnection.m b/Pods/GHUnit/Classes/Mock/GHMockNSURLConnection.m index 5b096e79..6abf3cf4 100644 --- a/Pods/GHUnit/Classes/Mock/GHMockNSURLConnection.m +++ b/Pods/GHUnit/Classes/Mock/GHMockNSURLConnection.m @@ -70,7 +70,7 @@ - (void)receiveData:(NSData *)data afterDelay:(NSTimeInterval)delay { if (delay < 0) { [delegate_ connection:(NSURLConnection *)self didReceiveData:data]; } else { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_current_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ [delegate_ connection:(NSURLConnection *)self didReceiveData:data]; }); } @@ -115,7 +115,7 @@ - (void)receiveResponse:(NSURLResponse *)response afterDelay:(NSTimeInterval)del if (delay < 0) { [delegate_ connection:(NSURLConnection *)self didReceiveResponse:response]; } else { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_current_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ [delegate_ connection:(NSURLConnection *)self didReceiveResponse:response]; }); } @@ -125,7 +125,7 @@ - (void)finishAfterDelay:(NSTimeInterval)delay { if (delay < 0) { [delegate_ connectionDidFinishLoading:(NSURLConnection *)self]; } else { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_current_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ [delegate_ connectionDidFinishLoading:(NSURLConnection *)self]; }); } @@ -135,7 +135,7 @@ - (void)failWithError:(NSError *)error afterDelay:(NSTimeInterval)delay { if (delay < 0) { [delegate_ connection:(NSURLConnection *)self didFailWithError:error]; } else { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_current_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ [delegate_ connection:(NSURLConnection *)self didFailWithError:error]; }); } diff --git a/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.h b/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.h index 97469a09..abd5f30e 100644 --- a/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.h +++ b/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.h @@ -39,10 +39,10 @@ - (void)testNodeDidChange:(GHTestNode *)node; @end -typedef enum { +typedef NS_ENUM(NSInteger, GHTestNodeFilter) { GHTestNodeFilterNone = 0, GHTestNodeFilterFailed = 1 -} GHTestNodeFilter; +}; /*! Test view model for use in a tree view. diff --git a/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.m b/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.m index 996df7a5..5753098f 100644 --- a/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.m +++ b/Pods/GHUnit/Classes/SharedUI/GHTestViewModel.m @@ -49,7 +49,7 @@ - (id)initWithIdentifier:(NSString *)identifier suite:(GHTestSuite *)suite { - (void)dealloc { // Clear delegates for(NSString *identifier in map_) - [[map_ objectForKey:identifier] setDelegate:nil]; + [map_[identifier] setDelegate:nil]; [runner_ cancel]; runner_.delegate = nil; @@ -63,17 +63,17 @@ - (NSString *)name { - (NSString *)statusString:(NSString *)prefix { NSInteger totalRunCount = [suite_ stats].testCount - ([suite_ disabledCount] + [suite_ stats].cancelCount); NSString *statusInterval = [NSString stringWithFormat:@"%@ %0.3fs (%0.3fs in test time)", (self.isRunning ? @"Running" : @"Took"), runner_.interval, [suite_ interval]]; - return [NSString stringWithFormat:@"%@%@ %d/%d (%d failures)", prefix, statusInterval, - [suite_ stats].succeedCount, totalRunCount, [suite_ stats].failureCount]; + return [NSString stringWithFormat:@"%@%@ %@/%@ (%@ failures)", prefix, statusInterval, + @([suite_ stats].succeedCount), @(totalRunCount), @([suite_ stats].failureCount)]; } - (void)registerNode:(GHTestNode *)node { - [map_ setObject:node forKey:node.identifier]; + map_[node.identifier] = node; node.delegate = self; } - (GHTestNode *)findTestNodeForTest:(id)test { - return [map_ objectForKey:[test identifier]]; + return map_[[test identifier]]; } - (GHTestNode *)findFailure { @@ -96,7 +96,7 @@ - (NSInteger)numberOfGroups { - (NSInteger)numberOfTestsInGroup:(NSInteger)group { NSArray *children = [root_ children]; if ([children count] == 0) return 0; - GHTestNode *groupNode = [children objectAtIndex:group]; + GHTestNode *groupNode = children[group]; return [[groupNode children] count]; } @@ -127,12 +127,12 @@ - (NSString *)_defaultsPath { if ([paths count] == 0) return nil; NSString *identifier = identifier_; if (!identifier) identifier = @"Tests"; - return [[paths objectAtIndex:0] stringByAppendingPathComponent:[NSString stringWithFormat:@"GHUnit-%@.tests", identifier]]; + return [paths[0] stringByAppendingPathComponent:[NSString stringWithFormat:@"GHUnit-%@.tests", identifier]]; } - (void)_updateTestNodeWithDefaults:(GHTestNode *)node { id test = node.test; - id testDefault = [defaults_ objectForKey:test.identifier]; + id testDefault = defaults_[test.identifier]; if (testDefault) { test.status = testDefault.status; test.interval = testDefault.interval; @@ -146,7 +146,7 @@ - (void)_updateTestNodeWithDefaults:(GHTestNode *)node { } - (void)_saveTestNodeToDefaults:(GHTestNode *)node { - [defaults_ setObject:node.test forKey:node.test.identifier]; + defaults_[node.test.identifier] = node.test; for(GHTestNode *childNode in [node children]) [self _saveTestNodeToDefaults:childNode]; } @@ -325,9 +325,9 @@ - (NSString *)statusString { } if (self.isGroupTest) { - NSString *statsString = [NSString stringWithFormat:@"%d/%d (%d failed)", - ([test_ stats].succeedCount+[test_ stats].failureCount), - [test_ stats].testCount, [test_ stats].failureCount]; + NSString *statsString = [NSString stringWithFormat:@"%@/%@ (%@ failed)", + @([test_ stats].succeedCount+[test_ stats].failureCount), + @([test_ stats].testCount), @([test_ stats].failureCount)]; return [NSString stringWithFormat:@"%@ %@ %@", status, statsString, interval]; } else { return [NSString stringWithFormat:@"%@ %@", status, interval]; diff --git a/Pods/GHUnit/LICENSE b/Pods/GHUnit/LICENSE index c0dbc5f8..5f8ea650 100644 --- a/Pods/GHUnit/LICENSE +++ b/Pods/GHUnit/LICENSE @@ -1,6 +1,8 @@ // // Created by Gabriel Handford on 3/1/09. -// Copyright 2009. All rights reserved. +// Copyright 2009-2013. All rights reserved. +// Modified by Felix Schulze on 2/11/13. +// Copyright 2013. All rights reserved. // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation diff --git a/Pods/GHUnit/README.md b/Pods/GHUnit/README.md index dbc57bed..f8c6b9b0 100644 --- a/Pods/GHUnit/README.md +++ b/Pods/GHUnit/README.md @@ -1,19 +1,20 @@ -# GHUnit [![Build Status](https://travis-ci.org/gh-unit/gh-unit.png)](https://travis-ci.org/gh-unit/gh-unit) +# GHUnit [![Maintained](https://img.shields.io/badge/Maintained-NO-red.svg)](https://github.com/gh-unit/gh-unit) [![Build Status](https://travis-ci.org/gh-unit/gh-unit.png)](https://travis-ci.org/gh-unit/gh-unit) [![Cocoa Pod](https://cocoapod-badges.herokuapp.com/v/GHUnit/badge.png)](http://gh-unit.github.io/gh-unit/) [![Cocoa Pod](https://cocoapod-badges.herokuapp.com/p/GHUnit/badge.png)](http://gh-unit.github.io/gh-unit/) [![License](https://img.shields.io/github/license/gh-unit/gh-unit.svg)](http://opensource.org/licenses/MIT) + +## GHUnit is deprecated and not actively maintained! Use `XCTest` instead. GHUnit is a test framework for Mac OS X and iOS. It can be used standalone or with other testing frameworks like SenTestingKit or GTM. -## Moved repostitory -GH-Unit is moved from gabriel/gh-unit to gh-unit/gh-unit. +If you need support for asynchronous tests you might want to check out [GRUnit](https://github.com/gabriel/GRUnit) which is a recent fork of this project. ## Features -- Run tests, breakpoint and interact directly with the XCode Debugger. +- Run tests, breakpoint and interact directly with the Xcode Debugger. - Run from the command line or via a Makefile. - Run tests in parallel. - Allow testing of UI components. - Capture and display test metrics. -- Search and filter tests by keywords. +- Search and filter tests by keywords. - View logging by test case. - Show stack traces and useful debugging information. - Include as a framework in your projects @@ -21,25 +22,75 @@ GH-Unit is moved from gabriel/gh-unit to gh-unit/gh-unit. - Quickly approve and record view changes - View image diff to see where views have changed -## Install (Cocoapods) +## Install (iOS) -Using [CocoaPods](http://cocoapods.org/): +### Install the GHUnit gem -### iOS +```xml +$ gem install ghunit ``` -target :Testtarget do - pod 'GHUnitIOS', '~> 0.5.7'` + +### Install the Tests target + +This will edit your ProjectName.xcodeproj file and create a Tests target, scheme, and a sample test file. + +```xml +$ ghunit install -n ProjectName +``` + +### Add the Tests target to your Podfile + +Create a new file named `Podfile` in the directory that contains the your `.xcodeproj` file, or edit it if it already exists. + +```ruby +# Podfile +platform :ios, '6.0' + +target :Tests do + pod 'GHUnit', '~> 0.5.9' end ``` -### OSX + +Install your project's pods. CocoaPods will then download and configure the required libraries for your project: +```xml +$ pod install ``` -target :Testtarget do - pod 'GHUnitOSX', '~> 0.5.7'` -end + +Note: If you don't have a Tests target in your project, you will get an error: "[!] Unable to find a target named Tests". If you named your test target something different, such as "ProjectTests" then the Podfile target line should look like: `target :ProjectTests do` instead. + +You should use the `.xcworkspace` file to work on your project: +```xml +$ open ProjectName.xcworkspace ``` +### Install Command Line + +```xml +$ ghunit install_cli -n ProjectName +``` + +Install ios-sim using homebrew: + +```xml +$ brew install ios-sim +``` + +Now you can run tests from the command line: + +```xml +$ ghunit run -n ProjectName +``` + +### Add a test + +To generate a test in your test target with name SampleTest: + +```xml +$ ghunit add -n ProjectName -f SampleTest +``` + + ## Install (From Source) -Checkout gh-unit. ### iOS ```bash @@ -56,26 +107,15 @@ Add the `GHUnit.framework` to your project ## Documentation -- [How to install, create and run tests](http://gh-unit.github.io//gh-unit/docs/index.html) +- [How to install, create and run tests](http://gh-unit.github.io/gh-unit/docs/index.html) - [Online documentation](http://gh-unit.github.io/gh-unit/) - [Google Group (Deprecated - Use Github Issues instead)](http://groups.google.com/group/ghunit) -## Install (Docset) - -- Open Xcode, Preferences and select the Documentation tab. -- Select the plus icon (bottom left) and specify: `http://gh-unit.github.io/gh-unit/publish/me.rel.GHUnit.atom` - - -## Mac OS X - -![GHUnit-0.4.18](http://rel.me.s3.amazonaws.com/images/GHUnit-0.4.18.png) - ## iOS -![GHUnit-IPhone-0.4.18](http://rel.me.s3.amazonaws.com/images/GHUnit-IPhone-0.4.18.png) +![GHUnit-IPhone-0.5.8](https://raw.github.com/gh-unit/gh-unit/master/Documentation/images/ios.png) -![GHUnit-IPhone-0.4.34](https://johnboiles.s3.amazonaws.com/ghunittestview.png) +## Mac OS X -![GHUnit-IPhone-0.4.34](https://johnboiles.s3.amazonaws.com/ghunitnewimage.png) +![GHUnit-0.5.8](https://raw.github.com/gh-unit/gh-unit/master/Documentation/images/macosx01.png) -![GHUnit-IPhone-0.4.34](https://johnboiles.s3.amazonaws.com/ghunitdiff.png) diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index e86c6852..18e10c6d 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,7 +1,7 @@ PODS: - DDMinizip (1.0.0.2017.06.25) - Discount (2.1.5a) - - GHUnit (0.5.8) + - GHUnit (0.6.0) - GRMustache (7.0.2): - JRSwizzle (~> 1.0) - JRSwizzle (1.0) @@ -18,7 +18,7 @@ DEPENDENCIES: - Discount (from `Specs/Discount.podspec`) - GHUnit (~> 0.5) - GRMustache (~> 7.0.2) - - Minizip/minishared (from `https://github.com/nmoinvaz/minizip.git`) + - Minizip/minishared (from `https://github.com/nmoinvaz/minizip.git`, commit `c6d04f9c642a730a4d5a295b811ec884b4fe3ba2`) - OCMock (~> 3.4) - ParseKit (from `Specs/ParseKit.podspec`) - RegexKitLite (from `https://github.com/inquisitiveSoft/RegexKitLite.git`) @@ -29,6 +29,7 @@ EXTERNAL SOURCES: Discount: :podspec: Specs/Discount.podspec Minizip: + :commit: c6d04f9c642a730a4d5a295b811ec884b4fe3ba2 :git: https://github.com/nmoinvaz/minizip.git ParseKit: :podspec: Specs/ParseKit.podspec @@ -49,7 +50,7 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: DDMinizip: 83ed28588afe79b164907317610e3862ad494d75 Discount: 2a100efef8ec69e3c59a9ab5a20cdec3d179e93c - GHUnit: 07609b0386af75f20ce520277d1c24fd8cd1598e + GHUnit: 327085549049e5a5f5f317a1e240a0ced5482f44 GRMustache: a724bfb0ac23c8f88a6388df9c7d73bc26e7005c JRSwizzle: dd5ead5d913a0f29e7f558200165849f006bb1e3 Minizip: b7213b5711d7c8961326f15f6c22fc9947950dd8 @@ -57,6 +58,6 @@ SPEC CHECKSUMS: ParseKit: 92f20b0017e23dd3c418e648169a13b8aa26bc24 RegexKitLite: 185a6b9d126b14e3e1f4df7570a50a3b3e27a036 -PODFILE CHECKSUM: 504b2e21b6ab7feca9cc228effa83eacae7055bb +PODFILE CHECKSUM: 5f639104b7222508b4011f84b974bcd6a4e03709 -COCOAPODS: 1.3.0.beta.2 +COCOAPODS: 1.2.0 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index ebb7eb13..5cadd238 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -2546,101 +2546,120 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 01EFCA012B394942298EB9749A9B0E5E /* Release */ = { + 06541590CF2792C6E6F195E812BBC746 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F67FF15183982A0477539AC62DDF5691 /* RegexKitLite.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "Target Support Files/RegexKitLite/RegexKitLite-prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PUBLIC_HEADERS_FOLDER_PATH = ""; + SDKROOT = macosx; + }; + name = Release; + }; + 1865DD1E5AF67212C87A12C85227B028 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; name = Release; }; - 055F75DD4F9AAA76843DB862D4F0D8B8 /* Debug */ = { + 1CA4DBA90294B44EE186CB5683596080 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EF3D720630DFBFB8B85A9B60BF426D0B /* JRSwizzle.xcconfig */; + baseConfigurationReference = 039F983AD008C21AF53E148B55E11DDF /* Pods-appledoc.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/JRSwizzle/JRSwizzle-prefix.pch"; + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SKIP_INSTALL = YES; }; name = Debug; }; - 174B52789A1D9DF6B090CF81682CB156 /* Release */ = { + 1F9F12F5AE13985A49217A9A096C41CF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4D1D4C4BAEA40540A9B35ADC4C80B907 /* Pods-AppledocTests.release.xcconfig */; + baseConfigurationReference = 72B20CDAF8B4E1BEDADC42F91BF633EC /* Discount.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - MACH_O_TYPE = staticlib; + GCC_PREFIX_HEADER = "Target Support Files/Discount/Discount-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SKIP_INSTALL = YES; }; - name = Release; + name = Debug; }; - 2A9599024AD668EA5A8E24143B69302C /* Release */ = { + 347BE53E86980D842866AB11BDEFC28D /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = C0376F3FFC7DE547B90CBCFAB434002B /* Minizip.xcconfig */; buildSettings = { @@ -2648,124 +2667,94 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Minizip/Minizip-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Release; }; - 37BF25561415A13CA6131C2698E67BD2 /* Release */ = { + 3D2C7E3BC5864EDB732AD129015AD9D1 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 72B20CDAF8B4E1BEDADC42F91BF633EC /* Discount.xcconfig */; + baseConfigurationReference = FFEF342C5CFA2FC9C777B5EDA6651C93 /* GRMustache.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Discount/Discount-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/GRMustache/GRMustache-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Release; }; - 3A3BB5AC485ED493D58811E6EF4FD774 /* Debug */ = { + 415CC7036F69513D87015F1BCBA6CFF0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8AD41D13E2FC21683D568D50DEEE7D4A /* DDMinizip.xcconfig */; + baseConfigurationReference = F67FF15183982A0477539AC62DDF5691 /* RegexKitLite.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/DDMinizip/DDMinizip-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/RegexKitLite/RegexKitLite-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Debug; }; - 4A4844C42495491DCB32FCFECDB26981 /* Release */ = { + 42E00BD024F42CE54EB6ECE663417078 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8AD41D13E2FC21683D568D50DEEE7D4A /* DDMinizip.xcconfig */; + baseConfigurationReference = EF3D720630DFBFB8B85A9B60BF426D0B /* JRSwizzle.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/DDMinizip/DDMinizip-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/JRSwizzle/JRSwizzle-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Release; }; - 4D7E3EE86FD9A9E9DA21556BBC7C9449 /* Debug */ = { + 46FCAAEF02929EFED7D20E9F2BC7634A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FFEF342C5CFA2FC9C777B5EDA6651C93 /* GRMustache.xcconfig */; + baseConfigurationReference = 5979D1BE73602C7759B26F725D10919D /* ParseKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/GRMustache/GRMustache-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/ParseKit/ParseKit-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; - name = Debug; + name = Release; }; - 4F0B231CF2771B8490704AC43413D27C /* Release */ = { + 86B3494074572A5A0905DB50D5094A1D /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9623FE61E9B4430AE95246E6C215E671 /* OCMock.xcconfig */; buildSettings = { @@ -2773,24 +2762,18 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/OCMock/OCMock-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Release; }; - 4F81C2A4D79C7B84B092F11147F4F906 /* Release */ = { + 8AA2929FDD9511226B912C684E8E3D77 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5979D1BE73602C7759B26F725D10919D /* ParseKit.xcconfig */; buildSettings = { @@ -2798,223 +2781,191 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/ParseKit/ParseKit-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + }; + name = Debug; + }; + 9AC855F312721B8DF2944CE422B10595 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AD40F32CDBDB8395ED7B0704A9E0E667 /* GHUnit.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "Target Support Files/GHUnit/GHUnit-prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PUBLIC_HEADERS_FOLDER_PATH = ""; + SDKROOT = macosx; + }; + name = Debug; + }; + A3153A01DBFFC1E2F1567C7C06417D4E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 72B20CDAF8B4E1BEDADC42F91BF633EC /* Discount.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + EXECUTABLE_PREFIX = lib; + GCC_PREFIX_HEADER = "Target Support Files/Discount/Discount-prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.6; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; + PUBLIC_HEADERS_FOLDER_PATH = ""; + SDKROOT = macosx; }; name = Release; }; - 5D0A18817BD7EB958CD1316DC3AEA790 /* Debug */ = { + A72EC53C6AE549E7A0DD6E6924120106 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9623FE61E9B4430AE95246E6C215E671 /* OCMock.xcconfig */; + baseConfigurationReference = 8AD41D13E2FC21683D568D50DEEE7D4A /* DDMinizip.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/OCMock/OCMock-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/DDMinizip/DDMinizip-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Debug; }; - 617BE79DEEFCF5C870D4E19A5917F5EF /* Release */ = { + AC48CBDFA09A29B05C6F486828F3CF3E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EF3D720630DFBFB8B85A9B60BF426D0B /* JRSwizzle.xcconfig */; + baseConfigurationReference = C0376F3FFC7DE547B90CBCFAB434002B /* Minizip.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/JRSwizzle/JRSwizzle-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/Minizip/Minizip-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; - name = Release; + name = Debug; }; - 74DE73B6BDD77476A2800B45A918E981 /* Debug */ = { + BFD8C7FD8A3DE80A069AE0F48936E0FE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; }; - 7698ECAC6501BCE4D6804D17E2E114C1 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 72B20CDAF8B4E1BEDADC42F91BF633EC /* Discount.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Discount/Discount-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - }; - name = Debug; - }; - 85710BCCCFEA6DAF871812BFA86F15D2 /* Debug */ = { + C05412DE97E91BE5A9AA31A99CA2DBA8 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD40F32CDBDB8395ED7B0704A9E0E667 /* GHUnit.xcconfig */; + baseConfigurationReference = EF3D720630DFBFB8B85A9B60BF426D0B /* JRSwizzle.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/GHUnit/GHUnit-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/JRSwizzle/JRSwizzle-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Debug; }; - 9AA133023D7A98EB5B19F14DC7689418 /* Release */ = { + C420F5E516990599D38CAB0B921B7D41 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FFEF342C5CFA2FC9C777B5EDA6651C93 /* GRMustache.xcconfig */; + baseConfigurationReference = 8AD41D13E2FC21683D568D50DEEE7D4A /* DDMinizip.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/GRMustache/GRMustache-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/DDMinizip/DDMinizip-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Release; }; - AFBB5A655C856A4E29FC6683BEABDD95 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C0376F3FFC7DE547B90CBCFAB434002B /* Minizip.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Minizip/Minizip-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - }; - name = Debug; - }; - B1B2747FF7F30A05143B1058B26D0870 /* Release */ = { + C680987646D8F6890F4FF88A87903667 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 82630909E1FD6068EBCCF545DAD4ECF7 /* Pods-appledoc.release.xcconfig */; buildSettings = { @@ -3022,172 +2973,114 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; }; name = Release; }; - B2B9AEE797E77A60324C2293A4DB0EC3 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 039F983AD008C21AF53E148B55E11DDF /* Pods-appledoc.debug.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - CC5AED89873006959CAB805F13212853 /* Debug */ = { + D27B9146D2423F6CCC1760E4E29F866E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F67FF15183982A0477539AC62DDF5691 /* RegexKitLite.xcconfig */; + baseConfigurationReference = AD40F32CDBDB8395ED7B0704A9E0E667 /* GHUnit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RegexKitLite/RegexKitLite-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; + GCC_PREFIX_HEADER = "Target Support Files/GHUnit/GHUnit-prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; - name = Debug; + name = Release; }; - D43EA2313F96141F32FF30430301F887 /* Release */ = { + DA5D2EC893DFB6DAD3F8640FD94B64B6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F67FF15183982A0477539AC62DDF5691 /* RegexKitLite.xcconfig */; + baseConfigurationReference = FFEF342C5CFA2FC9C777B5EDA6651C93 /* GRMustache.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RegexKitLite/RegexKitLite-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/GRMustache/GRMustache-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; - name = Release; + name = Debug; }; - D746A83A0BCE4D7230473BEF1CAA7945 /* Release */ = { + E0F995A52E36C3A6F6F4494603CF6F4E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD40F32CDBDB8395ED7B0704A9E0E667 /* GHUnit.xcconfig */; + baseConfigurationReference = 1C901363E0A0CFB605DEDCD025CD60C6 /* Pods-AppledocTests.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/GHUnit/GHUnit-prefix.pch"; + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SKIP_INSTALL = YES; }; - name = Release; + name = Debug; }; - F12230E1A71C00EB7DEC44C951FBA575 /* Debug */ = { + E3B31B8CD7F10D72735FB5A8049C6E2F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5979D1BE73602C7759B26F725D10919D /* ParseKit.xcconfig */; + baseConfigurationReference = 9623FE61E9B4430AE95246E6C215E671 /* OCMock.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/ParseKit/ParseKit-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/OCMock/OCMock-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; }; name = Debug; }; - F9EDC815E1B2AE28F8DDE077D3A19243 /* Debug */ = { + EDD2BDFA89FF201B35E649BE6B31B01F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1C901363E0A0CFB605DEDCD025CD60C6 /* Pods-AppledocTests.debug.xcconfig */; + baseConfigurationReference = 4D1D4C4BAEA40540A9B35ADC4C80B907 /* Pods-AppledocTests.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.6; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; }; - name = Debug; + name = Release; }; /* End XCBuildConfiguration section */ @@ -3195,8 +3088,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 74DE73B6BDD77476A2800B45A918E981 /* Debug */, - 01EFCA012B394942298EB9749A9B0E5E /* Release */, + BFD8C7FD8A3DE80A069AE0F48936E0FE /* Debug */, + 1865DD1E5AF67212C87A12C85227B028 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3204,8 +3097,8 @@ 2E30564A2BD954E1419FF7A79FA720C7 /* Build configuration list for PBXNativeTarget "GHUnit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 85710BCCCFEA6DAF871812BFA86F15D2 /* Debug */, - D746A83A0BCE4D7230473BEF1CAA7945 /* Release */, + 9AC855F312721B8DF2944CE422B10595 /* Debug */, + D27B9146D2423F6CCC1760E4E29F866E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3213,8 +3106,8 @@ 30E2FC42FE45FDA31436B99A507B4755 /* Build configuration list for PBXNativeTarget "GRMustache" */ = { isa = XCConfigurationList; buildConfigurations = ( - 4D7E3EE86FD9A9E9DA21556BBC7C9449 /* Debug */, - 9AA133023D7A98EB5B19F14DC7689418 /* Release */, + DA5D2EC893DFB6DAD3F8640FD94B64B6 /* Debug */, + 3D2C7E3BC5864EDB732AD129015AD9D1 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3222,8 +3115,8 @@ 5CD5A0F6DBE3892A6E331DD367E18E11 /* Build configuration list for PBXNativeTarget "OCMock" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5D0A18817BD7EB958CD1316DC3AEA790 /* Debug */, - 4F0B231CF2771B8490704AC43413D27C /* Release */, + E3B31B8CD7F10D72735FB5A8049C6E2F /* Debug */, + 86B3494074572A5A0905DB50D5094A1D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3231,8 +3124,8 @@ 9249B19BDAFF92AB333FC73231B1B7B3 /* Build configuration list for PBXNativeTarget "Discount" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7698ECAC6501BCE4D6804D17E2E114C1 /* Debug */, - 37BF25561415A13CA6131C2698E67BD2 /* Release */, + 1F9F12F5AE13985A49217A9A096C41CF /* Debug */, + A3153A01DBFFC1E2F1567C7C06417D4E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3240,8 +3133,8 @@ 9F21D28CE298CDA1EE46E606DABA92D1 /* Build configuration list for PBXNativeTarget "RegexKitLite" */ = { isa = XCConfigurationList; buildConfigurations = ( - CC5AED89873006959CAB805F13212853 /* Debug */, - D43EA2313F96141F32FF30430301F887 /* Release */, + 415CC7036F69513D87015F1BCBA6CFF0 /* Debug */, + 06541590CF2792C6E6F195E812BBC746 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3249,8 +3142,8 @@ CC266A77BAD8224D884D465081AFD2CE /* Build configuration list for PBXNativeTarget "JRSwizzle" */ = { isa = XCConfigurationList; buildConfigurations = ( - 055F75DD4F9AAA76843DB862D4F0D8B8 /* Debug */, - 617BE79DEEFCF5C870D4E19A5917F5EF /* Release */, + C05412DE97E91BE5A9AA31A99CA2DBA8 /* Debug */, + 42E00BD024F42CE54EB6ECE663417078 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3258,8 +3151,8 @@ E21B1E3221D5280516CDF1B2D5205F26 /* Build configuration list for PBXNativeTarget "Pods-AppledocTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - F9EDC815E1B2AE28F8DDE077D3A19243 /* Debug */, - 174B52789A1D9DF6B090CF81682CB156 /* Release */, + E0F995A52E36C3A6F6F4494603CF6F4E /* Debug */, + EDD2BDFA89FF201B35E649BE6B31B01F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3267,8 +3160,8 @@ E62F7954535C75D3A482B48FE68F6F4C /* Build configuration list for PBXNativeTarget "Pods-appledoc" */ = { isa = XCConfigurationList; buildConfigurations = ( - B2B9AEE797E77A60324C2293A4DB0EC3 /* Debug */, - B1B2747FF7F30A05143B1058B26D0870 /* Release */, + 1CA4DBA90294B44EE186CB5683596080 /* Debug */, + C680987646D8F6890F4FF88A87903667 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3276,8 +3169,8 @@ ECE67AE7AC1F97852CCC70E1D837F778 /* Build configuration list for PBXNativeTarget "DDMinizip" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3A3BB5AC485ED493D58811E6EF4FD774 /* Debug */, - 4A4844C42495491DCB32FCFECDB26981 /* Release */, + A72EC53C6AE549E7A0DD6E6924120106 /* Debug */, + C420F5E516990599D38CAB0B921B7D41 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3285,8 +3178,8 @@ F6C6E7F6FD79D4F1A8227816421A6A6C /* Build configuration list for PBXNativeTarget "Minizip" */ = { isa = XCConfigurationList; buildConfigurations = ( - AFBB5A655C856A4E29FC6683BEABDD95 /* Debug */, - 2A9599024AD668EA5A8E24143B69302C /* Release */, + AC48CBDFA09A29B05C6F486828F3CF3E /* Debug */, + 347BE53E86980D842866AB11BDEFC28D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -3294,8 +3187,8 @@ FABCD4D6B51123CA784E5AA2CAD3C2ED /* Build configuration list for PBXNativeTarget "ParseKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - F12230E1A71C00EB7DEC44C951FBA575 /* Debug */, - 4F81C2A4D79C7B84B092F11147F4F906 /* Release */, + 8AA2929FDD9511226B912C684E8E3D77 /* Debug */, + 46FCAAEF02929EFED7D20E9F2BC7634A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.markdown b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.markdown index 91064697..7ddff0c4 100644 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.markdown @@ -288,7 +288,9 @@ All rights reserved.\ // // Created by Gabriel Handford on 3/1/09. -// Copyright 2009. All rights reserved. +// Copyright 2009-2013. All rights reserved. +// Modified by Felix Schulze on 2/11/13. +// Copyright 2013. All rights reserved. // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.plist b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.plist index 830b8551..ba0bfdfe 100644 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-acknowledgements.plist @@ -329,7 +329,9 @@ All rights reserved.\ FooterText // // Created by Gabriel Handford on 3/1/09. -// Copyright 2009. All rights reserved. +// Copyright 2009-2013. All rights reserved. +// Modified by Felix Schulze on 2/11/13. +// Copyright 2013. All rights reserved. // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-frameworks.sh b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-frameworks.sh index 31b8bb0a..0f29f13c 100755 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-frameworks.sh +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-frameworks.sh @@ -24,8 +24,8 @@ install_framework() fi # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync --delete -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,15 +54,6 @@ install_framework() fi } -# Copies the dSYM of a vendored framework -install_dsym() { - local source="$1" - if [ -r "$source" ]; then - echo "rsync --delete -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" - fi -} - # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then @@ -85,7 +76,7 @@ strip_invalid_archs() { archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" stripped="" for arch in $archs; do - if ! [[ "${ARCHS}" == *"$arch"* ]]; then + if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-resources.sh b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-resources.sh index acf03cf0..cb7ed4c6 100755 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-resources.sh +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests-resources.sh @@ -21,9 +21,6 @@ case "${TARGETED_DEVICE_FAMILY}" in 3) TARGET_DEVICE_ARGS="--target-device tv" ;; - 4) - TARGET_DEVICE_ARGS="--target-device watch" - ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; @@ -44,29 +41,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync --delete -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true - rsync --delete -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -74,27 +71,27 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" || true + echo "$RESOURCE_PATH" echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestApp.xib" - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestView.xib" - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestWindow.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestApp.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestView.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestWindow.xib" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestApp.xib" - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestView.xib" - install_resource "${PODS_ROOT}/GHUnit/Classes-MacOSX/UI/GHTestWindow.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestApp.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestView.xib" + install_resource "GHUnit/Classes-MacOSX/UI/GHTestWindow.xib" fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi rm -f "$RESOURCES_TO_COPY" diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.debug.xcconfig b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.debug.xcconfig index 2f040ffb..dbd91bd3 100644 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.debug.xcconfig @@ -5,5 +5,4 @@ OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${P OTHER_LDFLAGS = $(inherited) -ObjC -l"DDMinizip" -l"Discount" -l"GHUnit" -l"GRMustache" -l"JRSwizzle" -l"Minizip" -l"OCMock" -l"ParseKit" -l"RegexKitLite" -l"icucore" -l"z" -framework "Foundation" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.release.xcconfig b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.release.xcconfig index 2f040ffb..dbd91bd3 100644 --- a/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.release.xcconfig +++ b/Pods/Target Support Files/Pods-AppledocTests/Pods-AppledocTests.release.xcconfig @@ -5,5 +5,4 @@ OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${P OTHER_LDFLAGS = $(inherited) -ObjC -l"DDMinizip" -l"Discount" -l"GHUnit" -l"GRMustache" -l"JRSwizzle" -l"Minizip" -l"OCMock" -l"ParseKit" -l"RegexKitLite" -l"icucore" -l"z" -framework "Foundation" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-frameworks.sh b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-frameworks.sh index 31b8bb0a..0f29f13c 100755 --- a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-frameworks.sh +++ b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-frameworks.sh @@ -24,8 +24,8 @@ install_framework() fi # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync --delete -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,15 +54,6 @@ install_framework() fi } -# Copies the dSYM of a vendored framework -install_dsym() { - local source="$1" - if [ -r "$source" ]; then - echo "rsync --delete -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" - fi -} - # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then @@ -85,7 +76,7 @@ strip_invalid_archs() { archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" stripped="" for arch in $archs; do - if ! [[ "${ARCHS}" == *"$arch"* ]]; then + if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" diff --git a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-resources.sh b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-resources.sh index b87306f5..443d4b30 100755 --- a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-resources.sh +++ b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc-resources.sh @@ -21,9 +21,6 @@ case "${TARGETED_DEVICE_FAMILY}" in 3) TARGET_DEVICE_ARGS="--target-device tv" ;; - 4) - TARGET_DEVICE_ARGS="--target-device watch" - ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; @@ -44,29 +41,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true + echo "ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" ibtool --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync --delete -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true - rsync --delete -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -74,17 +71,17 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" || true + echo "$RESOURCE_PATH" echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - rsync --delete -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi rm -f "$RESOURCES_TO_COPY" diff --git a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.debug.xcconfig b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.debug.xcconfig index 57b2bd60..cc77d40e 100644 --- a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.debug.xcconfig +++ b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.debug.xcconfig @@ -5,5 +5,4 @@ OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${P OTHER_LDFLAGS = $(inherited) -ObjC -l"DDMinizip" -l"Discount" -l"GRMustache" -l"JRSwizzle" -l"Minizip" -l"ParseKit" -l"RegexKitLite" -l"icucore" -l"z" -framework "Foundation" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.release.xcconfig b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.release.xcconfig index 57b2bd60..cc77d40e 100644 --- a/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.release.xcconfig +++ b/Pods/Target Support Files/Pods-appledoc/Pods-appledoc.release.xcconfig @@ -5,5 +5,4 @@ OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${P OTHER_LDFLAGS = $(inherited) -ObjC -l"DDMinizip" -l"Discount" -l"GRMustache" -l"JRSwizzle" -l"Minizip" -l"ParseKit" -l"RegexKitLite" -l"icucore" -l"z" -framework "Foundation" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Processing/GBCommentsProcessor.m b/Processing/GBCommentsProcessor.m index 4e77cb63..b9c2c1b2 100644 --- a/Processing/GBCommentsProcessor.m +++ b/Processing/GBCommentsProcessor.m @@ -49,6 +49,8 @@ - (BOOL) matchesObject:(id) object { return [self.description isEqualToString:[object nameOfEnum]]; else if ([object isKindOfClass:[GBTypedefBlockData class]]) return [self.description isEqualToString:[object nameOfBlock]]; + else if ([object isKindOfClass:[GBEnumConstantData class]]) + return [self.description isEqualToString:[object name]]; else if ([object isKindOfClass:[GBDocumentData class]]) return NO; else diff --git a/appledoc.xcodeproj/project.pbxproj b/appledoc.xcodeproj/project.pbxproj index 1372591d..c876ae5d 100644 --- a/appledoc.xcodeproj/project.pbxproj +++ b/appledoc.xcodeproj/project.pbxproj @@ -169,6 +169,9 @@ 7D11DEC417BA61CA0027DC2D /* GBEnumConstantData.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B844EE17A122650012C1DC /* GBEnumConstantData.m */; }; 7D11DEC617BA622B0027DC2D /* GBTypedefEnumData.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B844EB17A121030012C1DC /* GBTypedefEnumData.m */; }; 7D11DEC717BA62420027DC2D /* GBEnumConstantProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B844F117A122A50012C1DC /* GBEnumConstantProvider.m */; }; + 83C7018C2060AFBF009647D6 /* GBHTMLOutputGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 425CC22D20488BEA0099B364 /* GBHTMLOutputGenerator.m */; }; + 83C7018D2060AFC8009647D6 /* GBHTMLTemplateVariablesProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 739AD62E1255D8CB00B642C3 /* GBHTMLTemplateVariablesProvider.m */; }; + 83C7018E2060AFD2009647D6 /* GBMarkdownOutputGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 425CC23020488D630099B364 /* GBMarkdownOutputGenerator.m */; }; 86466CB01AAA1477002B003C /* GObjectiveCParser-BlockParsingTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 86466CAF1AAA1477002B003C /* GObjectiveCParser-BlockParsingTesting.m */; }; 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; 9328C127BD1269A1A2447359 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9328CE2BEBC125BF215A96C1 /* Localizable.strings */; }; @@ -1048,7 +1051,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 9E9653391791A3DA0086251B /* ShellScript */ = { @@ -1105,7 +1108,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -1121,6 +1124,7 @@ 736314A912ED7DB100852593 /* GBDocSetInstallGenerator.m in Sources */, 733EA139122BDE980060CBDE /* GHUnitTestMain.m in Sources */, 733EA13E122BDEBD0060CBDE /* GBAdoptedProtocolsProviderTesting.m in Sources */, + 83C7018C2060AFBF009647D6 /* GBHTMLOutputGenerator.m in Sources */, DA98B5941972151100059171 /* GBTypedefBlockArgument.m in Sources */, 733EA13F122BDEBE0060CBDE /* GBCategoryDataTesting.m in Sources */, 733EA140122BDEC10060CBDE /* GBClassDataTesting.m in Sources */, @@ -1160,6 +1164,7 @@ 733EA180122BE1720060CBDE /* GBLog.m in Sources */, 733EA181122BE1720060CBDE /* NSException+GBException.m in Sources */, 733EA182122BE1730060CBDE /* NSFileManager+GBFileManager.m in Sources */, + 83C7018D2060AFC8009647D6 /* GBHTMLTemplateVariablesProvider.m in Sources */, 733EA183122BE1740060CBDE /* NSObject+GBObject.m in Sources */, 733EA184122BE1750060CBDE /* NSString+GBString.m in Sources */, 732E6CBE12DF03A2009DD6E0 /* NSArray+GBArray.m in Sources */, @@ -1169,6 +1174,7 @@ 733EA187122BE17B0060CBDE /* GBMethodArgument.m in Sources */, 733EA188122BE17B0060CBDE /* GBMethodData.m in Sources */, 733EA189122BE17C0060CBDE /* GBMethodsProvider.m in Sources */, + 83C7018E2060AFD2009647D6 /* GBMarkdownOutputGenerator.m in Sources */, 733EA18A122BE17C0060CBDE /* GBModelBase.m in Sources */, 733EA18B122BE17D0060CBDE /* GBProtocolData.m in Sources */, 733EA18C122BE17E0060CBDE /* GBStore.m in Sources */,