Update format strings since newer clangs don't like some.

Author: thomasvl

Source/Objects/GTLRBatchQuery.m

@@ -94,8 +94,8 @@ - (NSString *)description {
   [dedupedNames removeObject:[NSNull null]];  // In case any didn't have a loggingName.
   NSString *namesStr = [[dedupedNames allObjects] componentsJoinedByString:@","];
 
-  return [NSString stringWithFormat:@"%@ %p (queries:%tu - %@)",
-          [self class], self, queries.count, namesStr];
+  return [NSString stringWithFormat:@"%@ %p (queries:%lu - %@)",
+          [self class], self, (long)queries.count, namesStr];
 }
 
 #pragma mark -

Source/Objects/GTLRBatchResult.m

@@ -75,9 +75,11 @@ - (BOOL)isEqual:(id)object {
 }
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"%@ %p (successes:%tu failures:%tu responseHeaders:%tu)",
+  return [NSString stringWithFormat:@"%@ %p (successes:%lu failures:%lu responseHeaders:%lu)",
           [self class], self,
-          self.successes.count, self.failures.count, self.responseHeaders.count];
+          (unsigned long)self.successes.count,
+          (unsigned long)self.failures.count,
+          (unsigned long)self.responseHeaders.count];
 }
 
 // This class is a subclass of GTLRObject, which declares NSSecureCoding

Source/Objects/GTLRObject.m

@@ -468,7 +468,8 @@ - (NSString *)JSONDescription {
     } else if ([rawValue isKindOfClass:[NSArray class]]) {
       // for arrays, show the number of items in the array:
       //   [3]
-      value = [NSString stringWithFormat:@"[%tu]", ((NSArray *)rawValue).count];
+      value = [NSString stringWithFormat:@"[%lu]",
+               (unsigned long)((NSArray *)rawValue).count];
     } else if ([rawValue isKindOfClass:[NSString class]]) {
       // for strings, show the string in quotes:
       //   "Hi mom."
@@ -580,8 +581,8 @@ - (id)objectAtIndexedSubscript:(NSUInteger)idx {
   NSArray *items = [self valueForKey:key];
   if (items == nil) {
     [NSException raise:NSRangeException
-                format:@"index %tu beyond bounds (%@ property \"%@\" is nil)",
-                       idx, [self class], key];
+                format:@"index %lu beyond bounds (%@ property \"%@\" is nil)",
+                       (unsigned long)idx, [self class], key];
   }
   id result = [items objectAtIndexedSubscript:idx];
   return result;
@@ -611,8 +612,9 @@ - (NSString *)description {
   if (self.JSON.count > 0) {
     jsonDesc = [self JSONDescription];
   }
-  return [NSString stringWithFormat:@"%@ %p: %tu bytes, contentType:%@ %@",
-          [self class], self, self.data.length, self.contentType, jsonDesc];
+  return [NSString stringWithFormat:@"%@ %p: %lu bytes, contentType:%@ %@",
+          [self class], self, (unsigned long)self.data.length, self.contentType,
+          jsonDesc];
 }
 
 - (id)copyWithZone:(NSZone *)zone {
@@ -661,7 +663,7 @@ - (NSArray *)itemsWithItemClass:(Class)itemClass {
 
 - (NSString *)JSONDescription {
   // Just like GTLRObject's handing of arrays, just return the count.
-  return [NSString stringWithFormat:@"[%tu]", self.JSON.count];
+  return [NSString stringWithFormat:@"[%lu]", (unsigned long)self.JSON.count];
 }
 
 @end

Source/Objects/GTLRQuery.m

@@ -208,7 +208,7 @@ + (NSString *)nextRequestID {
 
   @synchronized([GTLRQuery class]) {
     ++lastRequestID;
-    result = [NSString stringWithFormat:@"gtlr_%tu", lastRequestID];
+    result = [NSString stringWithFormat:@"gtlr_%lu", (unsigned long)lastRequestID];
   }
   return result;
 }

Source/Objects/GTLRService.m

@@ -692,7 +692,8 @@ - (GTLRServiceTicket *)fetchObjectWithURL:(NSURL *)targetURL
   if (loggingName.length > 0) {
     NSUInteger pageNumber = ticket.pagesFetchedCounter + 1;
     if (pageNumber > 1) {
-      loggingName = [loggingName stringByAppendingFormat:@", page %tu", pageNumber];
+      loggingName = [loggingName stringByAppendingFormat:@", page %lu",
+                     (unsigned long)pageNumber];
     }
     fetcher.comment = loggingName;
   }
@@ -1028,11 +1029,12 @@ - (GTLRServiceTicket *)executeBatchQuery:(GTLRBatchQuery *)batchObj
     NSUInteger pageNumber = ticket.pagesFetchedCounter;
     NSString *pageStr = @"";
     if (pageNumber > 0) {
-      pageStr = [NSString stringWithFormat:@"page %tu, ", pageNumber + 1];
+      pageStr = [NSString stringWithFormat:@"page %lu, ",
+                 (unsigned long)(pageNumber + 1)];
     }
-    batchCopy.loggingName = [NSString stringWithFormat:@"batch: %@ (%@%tu queries)",
+    batchCopy.loggingName = [NSString stringWithFormat:@"batch: %@ (%@%lu queries)",
                              [loggingNames.allObjects componentsJoinedByString:@", "],
-                             pageStr, numberOfQueries];
+                             pageStr, (unsigned long)numberOfQueries];
   }
 #endif
 
@@ -1371,8 +1373,9 @@ - (void)handleParsedObjectForFetcher:(GTMSessionFetcher *)fetcher
           } else {
             queryLabel = [[executingQuery class] description];
           }
-          GTLR_DEBUG_LOG(@"Executing %@ query required fetching %tu pages; use a query with"
-                         @" a larger maxResults for faster results", queryLabel, pageCount);
+          GTLR_DEBUG_LOG(@"Executing %@ query required fetching %lu pages; use a query with"
+                         @" a larger maxResults for faster results",
+                         queryLabel, (unsigned long)pageCount);
         }
   #endif
       }  // nextPageQuery
@@ -2668,7 +2671,8 @@ - (void)cancelTicket {
 - (void)startBackgroundTask {
 #if GTM_BACKGROUND_TASK_FETCHING
   GTLR_DEBUG_ASSERT(self.backgroundTaskIdentifier == UIBackgroundTaskInvalid,
-                    @"Redundant GTLRService background task: %tu", self.backgroundTaskIdentifier);
+                    @"Redundant GTLRService background task: %lu",
+                    (unsigned long)self.backgroundTaskIdentifier);
 
   NSString *taskName = [[self.executingQuery class] description];
 

Source/Tests/GTLRURITemplateTest.m

@@ -56,16 +56,16 @@ - (void)runTestSuites:(NSDictionary *)testSuites {
     for (NSArray *testCase in testCases) {
       // Each case is an array of the template and value...
       XCTAssertEqual(testCase.count, (NSUInteger)2,
-                     @" test index %tu of '%@'", idx, suiteName);
+                     @" test index %lu of '%@'", (unsigned long)idx, suiteName);
 
       NSString *testTemplate = [testCase objectAtIndex:0];
       NSString *expectedResult = [testCase objectAtIndex:1];
 
       NSString *result = [GTLRURITemplate expandTemplate:testTemplate
                                                   values:vars];
       XCTAssertEqualObjects(result, expectedResult,
-                            @"template was '%@' (index %tu of '%@')",
-                            testTemplate, idx, suiteName);
+                            @"template was '%@' (index %lu of '%@')",
+                            testTemplate, (unsigned long)idx, suiteName);
       ++idx;
     }
   }