From 208580541d7193e030290436bd5f7d97fd5d6bc6 Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Thu, 21 Mar 2019 17:17:08 -0400 Subject: [PATCH 1/9] GULLogger - provide synchronous API to get logged issues count --- GoogleUtilities/Logger/GULLogger.m | 39 ++++++++++++---------- GoogleUtilities/Logger/Private/GULLogger.h | 6 ++-- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index 4e8feafce8f..d6d2e987500 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -219,7 +219,8 @@ dispatch_queue_t getGULLoggerCounterQueue(void) { static dispatch_queue_t queue; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - queue = dispatch_queue_create("GoogleUtilities.GULLogger.counterQueue", DISPATCH_QUEUE_SERIAL); + queue = + dispatch_queue_create("GoogleUtilities.GULLogger.counterQueue", DISPATCH_QUEUE_CONCURRENT); dispatch_set_target_queue(queue, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0)); }); @@ -227,38 +228,40 @@ dispatch_queue_t getGULLoggerCounterQueue(void) { return queue; } -void GULAsyncGetUserDefaultsIntegerForKey(NSString *key, void (^completion)(NSInteger)) { - dispatch_async(getGULLoggerCounterQueue(), ^{ - NSInteger count = [getGULLoggerUsetDefaults() integerForKey:key]; - dispatch_async(dispatch_get_main_queue(), ^{ - completion(count); - }); +NSInteger GULSyncGetUserDefaultsIntegerForKey(NSString *key) { + __block NSInteger value = 0; + dispatch_sync(getGULLoggerCounterQueue(), ^{ + value = [getGULLoggerUsetDefaults() integerForKey:key]; }); + + return value; +} + +void GULIncrementUserDefaultsIntegerForKey(NSString *key) { + NSUserDefaults *defaults = getGULLoggerUsetDefaults(); + NSInteger errorCount = [defaults integerForKey:key]; + [defaults setInteger:errorCount + 1 forKey:key]; } -void GULNumberOfErrorsLogged(void (^completion)(NSInteger)) { - GULAsyncGetUserDefaultsIntegerForKey(kGULLoggerErrorCountKey, completion); +NSInteger GULNumberOfErrorsLogged(void) { + return GULSyncGetUserDefaultsIntegerForKey(kGULLoggerErrorCountKey); } -void GULNumberOfWarningsLogged(void (^completion)(NSInteger)) { - GULAsyncGetUserDefaultsIntegerForKey(kGULLoggerWarningCountKey, completion); +NSInteger GULNumberOfWarningsLogged(void) { + return GULSyncGetUserDefaultsIntegerForKey(kGULLoggerWarningCountKey); } void GULResetNumberOfIssuesLogged(void) { - dispatch_async(getGULLoggerCounterQueue(), ^{ + dispatch_barrier_async(getGULLoggerCounterQueue(), ^{ [getGULLoggerUsetDefaults() setInteger:0 forKey:kGULLoggerErrorCountKey]; [getGULLoggerUsetDefaults() setInteger:0 forKey:kGULLoggerWarningCountKey]; }); } -void GULIncrementUserDefaultsIntegerForKey(NSString *key) { - NSUserDefaults *defaults = getGULLoggerUsetDefaults(); - NSInteger errorCount = [defaults integerForKey:key]; - [defaults setInteger:errorCount + 1 forKey:key]; -} + void GULIncrementLogCountForLevel(GULLoggerLevel level) { - dispatch_async(getGULLoggerCounterQueue(), ^{ + dispatch_barrier_async(getGULLoggerCounterQueue(), ^{ if (level == GULLoggerLevelError) { GULIncrementUserDefaultsIntegerForKey(kGULLoggerErrorCountKey); } else if (level == GULLoggerLevelWarning) { diff --git a/GoogleUtilities/Logger/Private/GULLogger.h b/GoogleUtilities/Logger/Private/GULLogger.h index 453de4bd955..167f24c4caa 100644 --- a/GoogleUtilities/Logger/Private/GULLogger.h +++ b/GoogleUtilities/Logger/Private/GULLogger.h @@ -141,13 +141,15 @@ extern void GULLogDebug(GULLoggerService service, /** * Retrieve the number of errors that have been logged since the stat was last reset. + * Calling this method can be comparably expensive, so it should not be called from main thread. */ -extern void GULNumberOfErrorsLogged(void (^completion)(NSInteger)); +extern NSInteger GULNumberOfErrorsLogged(void); /** * Retrieve the number of warnings that have been logged since the stat was last reset. + * Calling this method can be comparably expensive, so it should not be called from main thread. */ -extern void GULNumberOfWarningsLogged(void (^completion)(NSInteger)); +extern NSInteger GULNumberOfWarningsLogged(void); /** * Reset number of errors and warnings that have been logged to 0. From 83c984919482a8fc573efa68ef0184c11388baec Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Thu, 21 Mar 2019 18:08:41 -0400 Subject: [PATCH 2/9] GULLogger tests --- .../Example/Tests/Logger/GULLoggerTest.m | 104 +++++++++--------- GoogleUtilities/Logger/GULLogger.m | 16 ++- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m index a9e0486cf94..1593cbe6bb1 100644 --- a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m +++ b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m @@ -33,6 +33,9 @@ extern BOOL getGULLoggerDebugMode(void); extern NSUserDefaults *getGULLoggerUsetDefaults(void); +extern void setGULLoggerUsetDefaults(NSUserDefaults *defaults); +extern dispatch_queue_t getGULLoggerCounterQueue(void); + static NSString *const kMessageCode = @"I-COR000001"; @@ -40,7 +43,8 @@ @interface GULLoggerTest : XCTestCase @property(nonatomic) NSString *randomLogString; -@property(nonatomic, strong) NSUserDefaults *defaults; +@property(nonatomic, strong) id mockLoggerUserDefaults; +@property(nonatomic, strong) NSUserDefaults *loggerUserDefaults; @end @@ -50,14 +54,21 @@ - (void)setUp { [super setUp]; GULResetLogger(); - // Stub NSUserDefaults for cleaner testing. - _defaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.google.logger_test"]; + self.loggerUserDefaults = getGULLoggerUsetDefaults(); + + NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.google.logger_test"]; + self.mockLoggerUserDefaults = OCMPartialMock(defaults); + setGULLoggerUsetDefaults(defaults); } - (void)tearDown { [super tearDown]; - _defaults = nil; + [self.mockLoggerUserDefaults stopMocking]; + self.mockLoggerUserDefaults = nil; + + setGULLoggerUsetDefaults(self.loggerUserDefaults); + self.loggerUserDefaults = nil; } - (void)testMessageCodeFormat { @@ -158,54 +169,32 @@ - (void)testGULLoggerLevelValues { - (void)testGetErrorWarningNumberBeforeLogDontCrash { GULResetLogger(); - XCTestExpectation *getErrorCountExpectation = - [self expectationWithDescription:@"getErrorCountExpectation"]; - XCTestExpectation *getWarningsCountExpectation = - [self expectationWithDescription:@"getWarningsCountExpectation"]; - - GULNumberOfErrorsLogged(^(NSInteger count) { - [getErrorCountExpectation fulfill]; - }); - - GULNumberOfWarningsLogged(^(NSInteger count) { - [getWarningsCountExpectation fulfill]; - }); - - [self waitForExpectations:@[ getErrorCountExpectation, getWarningsCountExpectation ] - timeout:0.5 - enforceOrder:YES]; + XCTAssertNoThrow(GULNumberOfErrorsLogged()); + XCTAssertNoThrow(GULNumberOfWarningsLogged()); } - (void)testErrorNumberIncrement { [getGULLoggerUsetDefaults() setInteger:10 forKey:kGULLoggerErrorCountKey]; - GULLogError(@"my service", NO, kMessageCode, @"Message."); - - XCTestExpectation *getErrorCountExpectation = - [self expectationWithDescription:@"getErrorCountExpectation"]; + [OCMExpect([self.mockLoggerUserDefaults setInteger:11 forKey:kGULLoggerErrorCountKey]) + andForwardToRealObject]; - GULNumberOfErrorsLogged(^(NSInteger count) { - [getErrorCountExpectation fulfill]; - XCTAssertEqual(count, 11); - }); + GULLogError(@"my service", NO, kMessageCode, @"Message."); - [self waitForExpectationsWithTimeout:0.5 handler:NULL]; + OCMVerify(self.mockLoggerUserDefaults); + XCTAssertEqual(GULNumberOfErrorsLogged(), 11); } - (void)testWarningNumberIncrement { [getGULLoggerUsetDefaults() setInteger:5 forKey:kGULLoggerWarningCountKey]; - GULLogWarning(@"my service", NO, kMessageCode, @"Message."); - - XCTestExpectation *getWarningsCountExpectation = - [self expectationWithDescription:@"getWarningsCountExpectation"]; + [OCMExpect([self.mockLoggerUserDefaults setInteger:6 forKey:kGULLoggerWarningCountKey]) + andForwardToRealObject]; - GULNumberOfWarningsLogged(^(NSInteger count) { - [getWarningsCountExpectation fulfill]; - XCTAssertEqual(count, 6); - }); + GULLogWarning(@"my service", NO, kMessageCode, @"Message."); - [self waitForExpectationsWithTimeout:0.5 handler:NULL]; + OCMVerify(self.mockLoggerUserDefaults); + XCTAssertEqual(GULNumberOfWarningsLogged(), 6); } - (void)testResetIssuesCount { @@ -214,24 +203,15 @@ - (void)testResetIssuesCount { GULResetNumberOfIssuesLogged(); - XCTestExpectation *getErrorCountExpectation = - [self expectationWithDescription:@"getErrorCountExpectation"]; - XCTestExpectation *getWarningsCountExpectation = - [self expectationWithDescription:@"getWarningsCountExpectation"]; - - GULNumberOfErrorsLogged(^(NSInteger count) { - [getErrorCountExpectation fulfill]; - XCTAssertEqual(count, 0); - }); - - GULNumberOfWarningsLogged(^(NSInteger count) { - [getWarningsCountExpectation fulfill]; - XCTAssertEqual(count, 0); - }); + XCTAssertEqual(GULNumberOfErrorsLogged(), 0); + XCTAssertEqual(GULNumberOfWarningsLogged(), 0); +} - [self waitForExpectations:@[ getErrorCountExpectation, getWarningsCountExpectation ] - timeout:0.5 - enforceOrder:YES]; +- (void)testNumberOfIssuesLoggedNoDeadlock { + [self dispatchSyncNestedDispatchCount:100 queue:getGULLoggerCounterQueue() block: ^{ + XCTAssertNoThrow(GULNumberOfErrorsLogged()); + XCTAssertNoThrow(GULNumberOfWarningsLogged()); + }]; } // Helper functions. @@ -272,5 +252,19 @@ - (BOOL)messageWasLogged:(NSString *)message { #pragma clang pop } +- (void)dispatchSyncNestedDispatchCount:(NSInteger)count + queue:(dispatch_queue_t)queue + block:(dispatch_block_t)block { + if (count < 0) { + return; + } + + dispatch_sync(queue, ^{ + [self dispatchSyncNestedDispatchCount:count - 1 queue:queue block:block]; + block(); + NSLog(@"%@, depth: %ld", NSStringFromSelector(_cmd), (long)count); + }); +} + @end #endif diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index d6d2e987500..eb39daa94f8 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -204,17 +204,25 @@ void GULLogBasic(GULLoggerLevel level, #undef GUL_MAKE_LOGGER #pragma mark - Number of errors and warnings - +static NSUserDefaults *sGULLoggerUsetDefaults = nil; NSUserDefaults *getGULLoggerUsetDefaults(void) { - static NSUserDefaults *_userDefaults = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - _userDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"GoogleUtilities.Logger.GULLogger"]; + sGULLoggerUsetDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"GoogleUtilities.Logger.GULLogger"]; }); - return _userDefaults; + return sGULLoggerUsetDefaults; } +#ifdef DEBUG +/** + * The method is used to inject NSUserDefaults for tests + */ +void setGULLoggerUsetDefaults(NSUserDefaults *defaults) { + sGULLoggerUsetDefaults = defaults; +} +#endif + dispatch_queue_t getGULLoggerCounterQueue(void) { static dispatch_queue_t queue; static dispatch_once_t onceToken; From 23e827b80d43d91510e04efe81df1f7f08176f7c Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Thu, 21 Mar 2019 20:14:41 -0400 Subject: [PATCH 3/9] GULLogger tests: make sure all async operations are finished by the test finish --- .../Example/Tests/Logger/GULLoggerTest.m | 35 +++++-------------- GoogleUtilities/Logger/GULLogger.m | 18 +++------- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m index 1593cbe6bb1..b2b052e1d35 100644 --- a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m +++ b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m @@ -43,9 +43,6 @@ @interface GULLoggerTest : XCTestCase @property(nonatomic) NSString *randomLogString; -@property(nonatomic, strong) id mockLoggerUserDefaults; -@property(nonatomic, strong) NSUserDefaults *loggerUserDefaults; - @end @implementation GULLoggerTest @@ -53,22 +50,14 @@ @implementation GULLoggerTest - (void)setUp { [super setUp]; GULResetLogger(); - - self.loggerUserDefaults = getGULLoggerUsetDefaults(); - - NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.google.logger_test"]; - self.mockLoggerUserDefaults = OCMPartialMock(defaults); - setGULLoggerUsetDefaults(defaults); } - (void)tearDown { - [super tearDown]; + // Make sure all async operations have finished before starting a new test. + [self drainQueue:getGULClientQueue()]; + [self drainQueue:getGULLoggerCounterQueue()]; - [self.mockLoggerUserDefaults stopMocking]; - self.mockLoggerUserDefaults = nil; - - setGULLoggerUsetDefaults(self.loggerUserDefaults); - self.loggerUserDefaults = nil; + [super tearDown]; } - (void)testMessageCodeFormat { @@ -176,24 +165,18 @@ - (void)testGetErrorWarningNumberBeforeLogDontCrash { - (void)testErrorNumberIncrement { [getGULLoggerUsetDefaults() setInteger:10 forKey:kGULLoggerErrorCountKey]; - [OCMExpect([self.mockLoggerUserDefaults setInteger:11 forKey:kGULLoggerErrorCountKey]) - andForwardToRealObject]; - GULLogError(@"my service", NO, kMessageCode, @"Message."); - OCMVerify(self.mockLoggerUserDefaults); + [self drainQueue:getGULLoggerCounterQueue()]; XCTAssertEqual(GULNumberOfErrorsLogged(), 11); } - (void)testWarningNumberIncrement { [getGULLoggerUsetDefaults() setInteger:5 forKey:kGULLoggerWarningCountKey]; - [OCMExpect([self.mockLoggerUserDefaults setInteger:6 forKey:kGULLoggerWarningCountKey]) - andForwardToRealObject]; - GULLogWarning(@"my service", NO, kMessageCode, @"Message."); - OCMVerify(self.mockLoggerUserDefaults); + [self drainQueue:getGULLoggerCounterQueue()]; XCTAssertEqual(GULNumberOfWarningsLogged(), 6); } @@ -216,15 +199,15 @@ - (void)testNumberOfIssuesLoggedNoDeadlock { // Helper functions. - (BOOL)logExists { - [self drainGULClientQueue]; + [self drainQueue:getGULClientQueue()]; NSString *correctMsg = [NSString stringWithFormat:@"%@[%@] %@", @"my service", kMessageCode, self.randomLogString]; return [self messageWasLogged:correctMsg]; } -- (void)drainGULClientQueue { +- (void)drainQueue:(dispatch_queue_t)queue { dispatch_semaphore_t workerSemaphore = dispatch_semaphore_create(0); - dispatch_async(getGULClientQueue(), ^{ + dispatch_barrier_async(queue, ^{ dispatch_semaphore_signal(workerSemaphore); }); dispatch_semaphore_wait(workerSemaphore, DISPATCH_TIME_FOREVER); diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index eb39daa94f8..6880decfa23 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -204,25 +204,17 @@ void GULLogBasic(GULLoggerLevel level, #undef GUL_MAKE_LOGGER #pragma mark - Number of errors and warnings -static NSUserDefaults *sGULLoggerUsetDefaults = nil; + NSUserDefaults *getGULLoggerUsetDefaults(void) { + static NSUserDefaults *_userDefaults = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - sGULLoggerUsetDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"GoogleUtilities.Logger.GULLogger"]; + _userDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"GoogleUtilities.Logger.GULLogger"]; }); - return sGULLoggerUsetDefaults; + return _userDefaults; } -#ifdef DEBUG -/** - * The method is used to inject NSUserDefaults for tests - */ -void setGULLoggerUsetDefaults(NSUserDefaults *defaults) { - sGULLoggerUsetDefaults = defaults; -} -#endif - dispatch_queue_t getGULLoggerCounterQueue(void) { static dispatch_queue_t queue; static dispatch_once_t onceToken; @@ -266,8 +258,6 @@ void GULResetNumberOfIssuesLogged(void) { }); } - - void GULIncrementLogCountForLevel(GULLoggerLevel level) { dispatch_barrier_async(getGULLoggerCounterQueue(), ^{ if (level == GULLoggerLevelError) { From 91a73f6a7ec156b5279956904b179b4bb0a6e002 Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Thu, 21 Mar 2019 20:20:40 -0400 Subject: [PATCH 4/9] Run ./scripts/style.sh --- GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m index b2b052e1d35..5d7ea569263 100644 --- a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m +++ b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m @@ -36,7 +36,6 @@ extern void setGULLoggerUsetDefaults(NSUserDefaults *defaults); extern dispatch_queue_t getGULLoggerCounterQueue(void); - static NSString *const kMessageCode = @"I-COR000001"; @interface GULLoggerTest : XCTestCase @@ -191,10 +190,12 @@ - (void)testResetIssuesCount { } - (void)testNumberOfIssuesLoggedNoDeadlock { - [self dispatchSyncNestedDispatchCount:100 queue:getGULLoggerCounterQueue() block: ^{ - XCTAssertNoThrow(GULNumberOfErrorsLogged()); - XCTAssertNoThrow(GULNumberOfWarningsLogged()); - }]; + [self dispatchSyncNestedDispatchCount:100 + queue:getGULLoggerCounterQueue() + block:^{ + XCTAssertNoThrow(GULNumberOfErrorsLogged()); + XCTAssertNoThrow(GULNumberOfWarningsLogged()); + }]; } // Helper functions. From 6938ac4e2c3f860951e4058591fbc1767f814311 Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Fri, 22 Mar 2019 12:01:32 -0400 Subject: [PATCH 5/9] GULLogger - use CFPreferences instead of NSUserDefaults --- GoogleUtilities/Logger/GULLogger.m | 42 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index eb39daa94f8..ffe6245b6eb 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -204,24 +204,10 @@ void GULLogBasic(GULLoggerLevel level, #undef GUL_MAKE_LOGGER #pragma mark - Number of errors and warnings -static NSUserDefaults *sGULLoggerUsetDefaults = nil; -NSUserDefaults *getGULLoggerUsetDefaults(void) { - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - sGULLoggerUsetDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"GoogleUtilities.Logger.GULLogger"]; - }); - return sGULLoggerUsetDefaults; -} - -#ifdef DEBUG -/** - * The method is used to inject NSUserDefaults for tests - */ -void setGULLoggerUsetDefaults(NSUserDefaults *defaults) { - sGULLoggerUsetDefaults = defaults; +CFStringRef getGULLoggerUsetDefaultsSuiteName(void) { + return (__bridge CFStringRef)@"GoogleUtilities.Logger.GULLogger"; } -#endif dispatch_queue_t getGULLoggerCounterQueue(void) { static dispatch_queue_t queue; @@ -237,18 +223,30 @@ dispatch_queue_t getGULLoggerCounterQueue(void) { } NSInteger GULSyncGetUserDefaultsIntegerForKey(NSString *key) { - __block NSInteger value = 0; + __block NSInteger integerValue = 0; dispatch_sync(getGULLoggerCounterQueue(), ^{ - value = [getGULLoggerUsetDefaults() integerForKey:key]; + id value = (__bridge_transfer id)CFPreferencesCopyAppValue((__bridge CFStringRef)key, + getGULLoggerUsetDefaultsSuiteName()); + if (![value isKindOfClass:[NSNumber class]]) { + return; + } + + integerValue = [(NSNumber *)value integerValue]; }); - return value; + return integerValue; } + + void GULIncrementUserDefaultsIntegerForKey(NSString *key) { - NSUserDefaults *defaults = getGULLoggerUsetDefaults(); - NSInteger errorCount = [defaults integerForKey:key]; - [defaults setInteger:errorCount + 1 forKey:key]; + NSInteger value = GULSyncGetUserDefaultsIntegerForKey(key); + + NSNumber *incrememntedValueNumber = @(value); + CFPreferencesSetAppValue((__bridge CFStringRef)key, + (__bridge CFNumberRef)incrememntedValueNumber, + getGULLoggerUsetDefaultsSuiteName()) ; + CFPreferencesAppSynchronize(getGULLoggerUsetDefaultsSuiteName()); } NSInteger GULNumberOfErrorsLogged(void) { From 532b12c224cfe2102e6567e85d947a6587be014a Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Fri, 22 Mar 2019 12:34:20 -0400 Subject: [PATCH 6/9] Revert unintentionally committed changes --- Gemfile.lock | 8 +- .../GoogleUtilities.xcodeproj/project.pbxproj | 344 +----------------- 2 files changed, 7 insertions(+), 345 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cbefcf0328c..19a8e920992 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11.1) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -34,7 +34,7 @@ GEM nap (~> 1.0) cocoapods-deintegrate (1.0.3) cocoapods-downloader (1.2.2) - cocoapods-generate (1.4.0) + cocoapods-generate (1.3.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) @@ -44,7 +44,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.4) escape (0.0.4) fourflusher (2.2.0) fuzzy_match (2.0.4) @@ -75,4 +75,4 @@ DEPENDENCIES cocoapods-generate BUNDLED WITH - 1.17.3 + 1.16.6 diff --git a/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj b/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj index b9ee39e39ca..c6d4418dfdf 100644 --- a/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj +++ b/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj @@ -7,17 +7,12 @@ objects = { /* Begin PBXBuildFile section */ - 5010E45E583BCBBC4B74BAE4 /* Pods_Tests_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0315BECB0D442B45B9E1783B /* Pods_Tests_iOS.framework */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; }; 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; - 67E28729AD6EC795B7E22B2E /* Pods_Example_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E82984465DBA7DB2572EB97 /* Pods_Example_macOS.framework */; }; - 7F2CFE675F808605309EF72A /* Pods_Example_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2401A6B82FF82E48A05A076B /* Pods_Example_iOS.framework */; }; - 9EBD72ABCBC18DCCC3521EBF /* Pods_Tests_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CDAA6E1E64C6B0207A03B73 /* Pods_Tests_macOS.framework */; }; - BF5A4A11D9032D9DBA9AFE8D /* Pods_Tests_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCAA609CE8CFF427E94A1F2 /* Pods_Tests_tvOS.framework */; }; DE5CF98E20F686310063FFDD /* GULAppEnvironmentUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DE5CF98C20F686290063FFDD /* GULAppEnvironmentUtilTest.m */; }; DE84BBC421D7EC900048A176 /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */; }; DE84BBC521D7EC900048A176 /* GULUserDefaultsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */; }; @@ -54,7 +49,6 @@ DEC9788720F6E1E000014E20 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DEC9788020F6E1DF00014E20 /* Main.storyboard */; }; DEC9788820F6E1E000014E20 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC9788120F6E1DF00014E20 /* main.m */; }; DEC9788920F6E1E000014E20 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DEC9788220F6E1DF00014E20 /* AppDelegate.m */; }; - E404C9BAB8534152D69FA08E /* Pods_Example_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 927236B77C49BBA1E29FF758 /* Pods_Example_tvOS.framework */; }; EFBE67FA2101401100E756A7 /* GULSwizzlerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F02101401100E756A7 /* GULSwizzlerTest.m */; }; EFBE67FB2101401100E756A7 /* GULSwizzlingCacheTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F12101401100E756A7 /* GULSwizzlingCacheTest.m */; }; EFBE67FC2101401100E756A7 /* GULRuntimeClassDiffTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EFBE67F22101401100E756A7 /* GULRuntimeClassDiffTests.m */; }; @@ -91,13 +85,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0315BECB0D442B45B9E1783B /* Pods_Tests_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 03F97D5A8F7DAD6624FCE73E /* Pods-Example_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_iOS.release.xcconfig"; path = "Target Support Files/Pods-Example_iOS/Pods-Example_iOS.release.xcconfig"; sourceTree = ""; }; - 2401A6B82FF82E48A05A076B /* Pods_Example_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 27A632686A9C2AF37D8805AD /* Pods-Example_tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_tvOS.debug.xcconfig"; path = "Target Support Files/Pods-Example_tvOS/Pods-Example_tvOS.debug.xcconfig"; sourceTree = ""; }; - 2CDAA6E1E64C6B0207A03B73 /* Pods_Tests_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 39DFCBDF0B70F9ED098BC915 /* Pods-Tests_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_iOS.release.xcconfig"; path = "Target Support Files/Pods-Tests_iOS/Pods-Tests_iOS.release.xcconfig"; sourceTree = ""; }; - 3E82984465DBA7DB2572EB97 /* Pods_Example_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58A195388D20070C39A /* Example_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -106,15 +93,7 @@ 6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; 7BEA793625C8DE7C8EC60006 /* GoogleUtilities.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GoogleUtilities.podspec; path = ../GoogleUtilities.podspec; sourceTree = ""; }; - 86BB5AF18502CE3329A9DA7F /* Pods-Tests_macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_macOS.debug.xcconfig"; path = "Target Support Files/Pods-Tests_macOS/Pods-Tests_macOS.debug.xcconfig"; sourceTree = ""; }; - 927236B77C49BBA1E29FF758 /* Pods_Example_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A6CCC48DDD8A66EF09AEE171 /* Pods-Example_macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_macOS.release.xcconfig"; path = "Target Support Files/Pods-Example_macOS/Pods-Example_macOS.release.xcconfig"; sourceTree = ""; }; - ADF9B6141E64C0A9CB3A81C3 /* Pods-Tests_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_iOS.debug.xcconfig"; path = "Target Support Files/Pods-Tests_iOS/Pods-Tests_iOS.debug.xcconfig"; sourceTree = ""; }; - C148FECCC3A47393D17941A3 /* Pods-Example_macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_macOS.debug.xcconfig"; path = "Target Support Files/Pods-Example_macOS/Pods-Example_macOS.debug.xcconfig"; sourceTree = ""; }; - CC25AADF7AA91B03070B63BC /* Pods-Tests_tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_tvOS.debug.xcconfig"; path = "Target Support Files/Pods-Tests_tvOS/Pods-Tests_tvOS.debug.xcconfig"; sourceTree = ""; }; - CDCAA609CE8CFF427E94A1F2 /* Pods_Tests_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D2CA0D2CA54493E7A941B096 /* Pods-Example_tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_tvOS.release.xcconfig"; path = "Target Support Files/Pods-Example_tvOS/Pods-Example_tvOS.release.xcconfig"; sourceTree = ""; }; - D383E2D708710320026B1681 /* Pods-Tests_macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_macOS.release.xcconfig"; path = "Target Support Files/Pods-Tests_macOS/Pods-Tests_macOS.release.xcconfig"; sourceTree = ""; }; + 9A08A2252245459300762876 /* Gemfile.lock */ = {isa = PBXFileReference; lastKnownFileType = text; name = Gemfile.lock; path = ../../Gemfile.lock; sourceTree = ""; }; DE5CF98C20F686290063FFDD /* GULAppEnvironmentUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULAppEnvironmentUtilTest.m; sourceTree = ""; }; DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULUserDefaultsTests.m; sourceTree = ""; }; DEC977D320F68C3300014E20 /* GULReachabilityCheckerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULReachabilityCheckerTest.m; sourceTree = ""; }; @@ -152,7 +131,6 @@ DEC9788320F6E1DF00014E20 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DEC9788420F6E1DF00014E20 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; E0A8D570636E99E7C3396DF8 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - E5BC6CE2E4741B11EA94F989 /* Pods-Example_iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_iOS.debug.xcconfig"; path = "Target Support Files/Pods-Example_iOS/Pods-Example_iOS.debug.xcconfig"; sourceTree = ""; }; EFBE67F02101401100E756A7 /* GULSwizzlerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULSwizzlerTest.m; sourceTree = ""; }; EFBE67F12101401100E756A7 /* GULSwizzlingCacheTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULSwizzlingCacheTest.m; sourceTree = ""; }; EFBE67F22101401100E756A7 /* GULRuntimeClassDiffTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULRuntimeClassDiffTests.m; sourceTree = ""; }; @@ -164,7 +142,6 @@ EFBE67F82101401100E756A7 /* GULRuntimeSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULRuntimeSnapshotTests.m; sourceTree = ""; }; EFBE67F92101401100E756A7 /* GULAppDelegateSwizzlerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULAppDelegateSwizzlerTest.m; sourceTree = ""; }; F1F2A7C03C10A3A03F9502B8 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - FAF3FC1C1F504D8CE8AF21CD /* Pods-Tests_tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests_tvOS.release.xcconfig"; path = "Target Support Files/Pods-Tests_tvOS/Pods-Tests_tvOS.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -175,7 +152,6 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - 7F2CFE675F808605309EF72A /* Pods_Example_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -186,7 +162,6 @@ 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - 5010E45E583BCBBC4B74BAE4 /* Pods_Tests_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -194,7 +169,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 67E28729AD6EC795B7E22B2E /* Pods_Example_macOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -202,7 +176,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9EBD72ABCBC18DCCC3521EBF /* Pods_Tests_macOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -210,7 +183,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E404C9BAB8534152D69FA08E /* Pods_Example_tvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -218,7 +190,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BF5A4A11D9032D9DBA9AFE8D /* Pods_Tests_tvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -259,12 +230,6 @@ 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, 6003F5AF195388D20070C39A /* XCTest.framework */, - 2401A6B82FF82E48A05A076B /* Pods_Example_iOS.framework */, - 3E82984465DBA7DB2572EB97 /* Pods_Example_macOS.framework */, - 927236B77C49BBA1E29FF758 /* Pods_Example_tvOS.framework */, - 0315BECB0D442B45B9E1783B /* Pods_Tests_iOS.framework */, - 2CDAA6E1E64C6B0207A03B73 /* Pods_Tests_macOS.framework */, - CDCAA609CE8CFF427E94A1F2 /* Pods_Tests_tvOS.framework */, ); name = Frameworks; sourceTree = ""; @@ -294,6 +259,7 @@ 60FF7A9C1954A5C5007DD14C /* Podspec Metadata */ = { isa = PBXGroup; children = ( + 9A08A2252245459300762876 /* Gemfile.lock */, 7BEA793625C8DE7C8EC60006 /* GoogleUtilities.podspec */, E0A8D570636E99E7C3396DF8 /* README.md */, F1F2A7C03C10A3A03F9502B8 /* LICENSE */, @@ -304,20 +270,7 @@ B0E86D0C718FA8A1F3F5EE6B /* Pods */ = { isa = PBXGroup; children = ( - E5BC6CE2E4741B11EA94F989 /* Pods-Example_iOS.debug.xcconfig */, - 03F97D5A8F7DAD6624FCE73E /* Pods-Example_iOS.release.xcconfig */, - C148FECCC3A47393D17941A3 /* Pods-Example_macOS.debug.xcconfig */, - A6CCC48DDD8A66EF09AEE171 /* Pods-Example_macOS.release.xcconfig */, - 27A632686A9C2AF37D8805AD /* Pods-Example_tvOS.debug.xcconfig */, - D2CA0D2CA54493E7A941B096 /* Pods-Example_tvOS.release.xcconfig */, - ADF9B6141E64C0A9CB3A81C3 /* Pods-Tests_iOS.debug.xcconfig */, - 39DFCBDF0B70F9ED098BC915 /* Pods-Tests_iOS.release.xcconfig */, - 86BB5AF18502CE3329A9DA7F /* Pods-Tests_macOS.debug.xcconfig */, - D383E2D708710320026B1681 /* Pods-Tests_macOS.release.xcconfig */, - CC25AADF7AA91B03070B63BC /* Pods-Tests_tvOS.debug.xcconfig */, - FAF3FC1C1F504D8CE8AF21CD /* Pods-Tests_tvOS.release.xcconfig */, - ); - name = Pods; + ); path = Pods; sourceTree = ""; }; @@ -441,11 +394,9 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "Example_iOS" */; buildPhases = ( - 1FA4D4B5D56C1AB7DD22691B /* [CP] Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - D4844DDA01F57C0D7083C7FB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -460,11 +411,9 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "Tests_iOS" */; buildPhases = ( - C9436F260F3033408C9F2135 /* [CP] Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - 07B91CD0D8B307842D1B6522 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -480,11 +429,9 @@ isa = PBXNativeTarget; buildConfigurationList = DEC9781620F6D0EB00014E20 /* Build configuration list for PBXNativeTarget "Example_macOS" */; buildPhases = ( - 47C0123C9D679C4C11B3E323 /* [CP] Check Pods Manifest.lock */, DEC977F520F6D0E900014E20 /* Sources */, DEC977F620F6D0E900014E20 /* Frameworks */, DEC977F720F6D0E900014E20 /* Resources */, - 22B4ACE99B7B47B7A47290D0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -499,11 +446,9 @@ isa = PBXNativeTarget; buildConfigurationList = DEC9781720F6D0EB00014E20 /* Build configuration list for PBXNativeTarget "Tests_macOS" */; buildPhases = ( - DBCECFF7C686279C5BA396CE /* [CP] Check Pods Manifest.lock */, DEC9780720F6D0EA00014E20 /* Sources */, DEC9780820F6D0EA00014E20 /* Frameworks */, DEC9780920F6D0EA00014E20 /* Resources */, - 7DAE8EFBBFC38E1BA55FD818 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -519,11 +464,9 @@ isa = PBXNativeTarget; buildConfigurationList = DEC9786620F6D5DA00014E20 /* Build configuration list for PBXNativeTarget "Example_tvOS" */; buildPhases = ( - D9A9583854F645E0469E3637 /* [CP] Check Pods Manifest.lock */, DEC9784320F6D5D800014E20 /* Sources */, DEC9784420F6D5D800014E20 /* Frameworks */, DEC9784520F6D5D800014E20 /* Resources */, - 64504605EE3A2F577917FE42 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -538,11 +481,9 @@ isa = PBXNativeTarget; buildConfigurationList = DEC9786720F6D5DA00014E20 /* Build configuration list for PBXNativeTarget "Tests_tvOS" */; buildPhases = ( - D3BD8386FDED4C208D1BDFAD /* [CP] Check Pods Manifest.lock */, DEC9785720F6D5DA00014E20 /* Sources */, DEC9785820F6D5DA00014E20 /* Frameworks */, DEC9785920F6D5DA00014E20 /* Resources */, - 5D58C15DF33B69609B38244B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -661,273 +602,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 07B91CD0D8B307842D1B6522 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Tests_iOS/Pods-Tests_iOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock-iOS/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests_iOS/Pods-Tests_iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1FA4D4B5D56C1AB7DD22691B /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Example_iOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; - 22B4ACE99B7B47B7A47290D0 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Example_macOS/Pods-Example_macOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities-macOS/GoogleUtilities.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example_macOS/Pods-Example_macOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 47C0123C9D679C4C11B3E323 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Example_macOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; - 5D58C15DF33B69609B38244B /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Tests_tvOS/Pods-Tests_tvOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock-tvOS/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests_tvOS/Pods-Tests_tvOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 64504605EE3A2F577917FE42 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Example_tvOS/Pods-Example_tvOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities-tvOS/GoogleUtilities.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example_tvOS/Pods-Example_tvOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 7DAE8EFBBFC38E1BA55FD818 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Tests_macOS/Pods-Tests_macOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock-macOS/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests_macOS/Pods-Tests_macOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - C9436F260F3033408C9F2135 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Tests_iOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; - D3BD8386FDED4C208D1BDFAD /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Tests_tvOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; - D4844DDA01F57C0D7083C7FB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Example_iOS/Pods-Example_iOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities-iOS/GoogleUtilities.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example_iOS/Pods-Example_iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D9A9583854F645E0469E3637 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Example_tvOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; - DBCECFF7C686279C5BA396CE /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Tests_macOS-checkManifestLockResult.txt", - ); - 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"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 6003F586195388D20070C39A /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -1165,7 +839,6 @@ }; 6003F5C0195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E5BC6CE2E4741B11EA94F989 /* Pods-Example_iOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -1187,7 +860,6 @@ }; 6003F5C1195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 03F97D5A8F7DAD6624FCE73E /* Pods-Example_iOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -1209,7 +881,6 @@ }; 6003F5C3195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ADF9B6141E64C0A9CB3A81C3 /* Pods-Tests_iOS.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1237,7 +908,6 @@ }; 6003F5C4195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 39DFCBDF0B70F9ED098BC915 /* Pods-Tests_iOS.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1262,7 +932,6 @@ }; DEC9781220F6D0EB00014E20 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C148FECCC3A47393D17941A3 /* Pods-Example_macOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1288,7 +957,6 @@ }; DEC9781320F6D0EB00014E20 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A6CCC48DDD8A66EF09AEE171 /* Pods-Example_macOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1315,7 +983,6 @@ }; DEC9781420F6D0EB00014E20 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 86BB5AF18502CE3329A9DA7F /* Pods-Tests_macOS.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -1346,7 +1013,6 @@ }; DEC9781520F6D0EB00014E20 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D383E2D708710320026B1681 /* Pods-Tests_macOS.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -1378,7 +1044,6 @@ }; DEC9786220F6D5DA00014E20 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27A632686A9C2AF37D8805AD /* Pods-Example_tvOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -1404,7 +1069,6 @@ }; DEC9786320F6D5DA00014E20 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D2CA0D2CA54493E7A941B096 /* Pods-Example_tvOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -1431,7 +1095,6 @@ }; DEC9786420F6D5DA00014E20 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CC25AADF7AA91B03070B63BC /* Pods-Tests_tvOS.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -1461,7 +1124,6 @@ }; DEC9786520F6D5DA00014E20 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FAF3FC1C1F504D8CE8AF21CD /* Pods-Tests_tvOS.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; From 97dc32e586286b78648c610ba8a5028bdb2a1d97 Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Fri, 22 Mar 2019 12:35:41 -0400 Subject: [PATCH 7/9] Revert unintentionally committed changes --- .../Example/GoogleUtilities.xcodeproj/project.pbxproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj b/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj index c6d4418dfdf..754333d6676 100644 --- a/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj +++ b/GoogleUtilities/Example/GoogleUtilities.xcodeproj/project.pbxproj @@ -93,7 +93,6 @@ 6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; 7BEA793625C8DE7C8EC60006 /* GoogleUtilities.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GoogleUtilities.podspec; path = ../GoogleUtilities.podspec; sourceTree = ""; }; - 9A08A2252245459300762876 /* Gemfile.lock */ = {isa = PBXFileReference; lastKnownFileType = text; name = Gemfile.lock; path = ../../Gemfile.lock; sourceTree = ""; }; DE5CF98C20F686290063FFDD /* GULAppEnvironmentUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULAppEnvironmentUtilTest.m; sourceTree = ""; }; DE84BBC321D7EC900048A176 /* GULUserDefaultsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULUserDefaultsTests.m; sourceTree = ""; }; DEC977D320F68C3300014E20 /* GULReachabilityCheckerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GULReachabilityCheckerTest.m; sourceTree = ""; }; @@ -206,7 +205,6 @@ 6003F5B5195388D20070C39A /* Tests */, 6003F58C195388D20070C39A /* Frameworks */, 6003F58B195388D20070C39A /* Products */, - B0E86D0C718FA8A1F3F5EE6B /* Pods */, ); sourceTree = ""; }; @@ -259,7 +257,6 @@ 60FF7A9C1954A5C5007DD14C /* Podspec Metadata */ = { isa = PBXGroup; children = ( - 9A08A2252245459300762876 /* Gemfile.lock */, 7BEA793625C8DE7C8EC60006 /* GoogleUtilities.podspec */, E0A8D570636E99E7C3396DF8 /* README.md */, F1F2A7C03C10A3A03F9502B8 /* LICENSE */, @@ -267,13 +264,6 @@ name = "Podspec Metadata"; sourceTree = ""; }; - B0E86D0C718FA8A1F3F5EE6B /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; DE5CF98B20F686290063FFDD /* Environment */ = { isa = PBXGroup; children = ( From 05008cca9ca7e4a498e3514c43864b2d2be9298e Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Fri, 22 Mar 2019 12:38:10 -0400 Subject: [PATCH 8/9] Cleanup --- GoogleUtilities/Logger/GULLogger.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index d4f48d06373..a0a2f0f8c74 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -231,11 +231,6 @@ void GULLoggerUserDefaultsSetIntegerForKey(NSInteger count, NSString *key) { CFPreferencesAppSynchronize(getGULLoggerUsetDefaultsSuiteName()); } -void GULIncrementUserDefaultsIntegerForKey(NSString *key) { - NSInteger value = GULGetUserDefaultsIntegerForKey(key); - GULLoggerUserDefaultsSetIntegerForKey(value + 1, key); -} - #pragma mark - Number of errors and warnings dispatch_queue_t getGULLoggerCounterQueue(void) { @@ -275,6 +270,11 @@ void GULResetNumberOfIssuesLogged(void) { }); } +void GULIncrementUserDefaultsIntegerForKey(NSString *key) { + NSInteger value = GULGetUserDefaultsIntegerForKey(key); + GULLoggerUserDefaultsSetIntegerForKey(value + 1, key); +} + void GULIncrementLogCountForLevel(GULLoggerLevel level) { dispatch_barrier_async(getGULLoggerCounterQueue(), ^{ if (level == GULLoggerLevelError) { From 5d2acb6dbcf49c6de079db13e6803c043097bdf3 Mon Sep 17 00:00:00 2001 From: Maksym Malyhin Date: Fri, 22 Mar 2019 13:49:57 -0400 Subject: [PATCH 9/9] Run ./scripts/style.sh --- GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m | 3 ++- GoogleUtilities/Logger/GULLogger.m | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m index f541039f5f6..35109e71518 100644 --- a/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m +++ b/GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m @@ -50,7 +50,8 @@ - (void)setUp { [super setUp]; GULResetLogger(); - self.loggerDefaults = [[NSUserDefaults alloc] initWithSuiteName:CFBridgingRelease(getGULLoggerUsetDefaultsSuiteName())]; + self.loggerDefaults = [[NSUserDefaults alloc] + initWithSuiteName:CFBridgingRelease(getGULLoggerUsetDefaultsSuiteName())]; } - (void)tearDown { diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index a0a2f0f8c74..7a88af8cf5e 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -210,7 +210,7 @@ void GULLogBasic(GULLoggerLevel level, // We have to use C API deireclty here CFStringRef getGULLoggerUsetDefaultsSuiteName(void) { - return (__bridge CFStringRef)@"GoogleUtilities.Logger.GULLogger"; + return (__bridge CFStringRef) @"GoogleUtilities.Logger.GULLogger"; } NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) { @@ -225,9 +225,8 @@ NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) { void GULLoggerUserDefaultsSetIntegerForKey(NSInteger count, NSString *key) { NSNumber *countNumber = @(count); - CFPreferencesSetAppValue((__bridge CFStringRef)key, - (__bridge CFNumberRef)countNumber, - getGULLoggerUsetDefaultsSuiteName()) ; + CFPreferencesSetAppValue((__bridge CFStringRef)key, (__bridge CFNumberRef)countNumber, + getGULLoggerUsetDefaultsSuiteName()); CFPreferencesAppSynchronize(getGULLoggerUsetDefaultsSuiteName()); }