Merge pull request #4730 from acozzette/xcode

Cherry-picked XCode 10 fixes into 3.6.x branch

Author: Adam Cozzette

objectivec/DevTools/full_mac_build.sh

@@ -244,8 +244,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
       exit 10
       ;;
     7.* )
-      echo "ERROR: The unittests include Swift code that is now Swift 3.0." 1>&2
-      echo "ERROR: Xcode 8.0 or higher is required to build the test suite, but the library works with Xcode 7.x." 1>&2
+      echo "ERROR: Xcode 7.x no longer supported for building, please use 8.0 or higher." 1>&2
       exit 11
       ;;
     8.0* )

objectivec/GPBArray.m

@@ -2537,12 +2537,12 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
   return [_array countByEnumeratingWithState:state objects:buffer count:len];
 }
 
-- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block {
+- (void)enumerateObjectsUsingBlock:(void (NS_NOESCAPE ^)(id obj, NSUInteger idx, BOOL *stop))block {
   [_array enumerateObjectsUsingBlock:block];
 }
 
 - (void)enumerateObjectsWithOptions:(NSEnumerationOptions)opts
-                         usingBlock:(void (^)(id obj, NSUInteger idx, BOOL *stop))block {
+                         usingBlock:(void (NS_NOESCAPE ^)(id obj, NSUInteger idx, BOOL *stop))block {
   [_array enumerateObjectsWithOptions:opts usingBlock:block];
 }
 

objectivec/GPBDescriptor.m

@@ -411,7 +411,7 @@ - (void)dealloc {
 }
 
 - (NSString *)name {
-  return @(name_);
+  return (NSString * _Nonnull)@(name_);
 }
 
 - (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber {
@@ -582,7 +582,7 @@ - (uint32_t)number {
 }
 
 - (NSString *)name {
-  return @(description_->name);
+  return (NSString * _Nonnull)@(description_->name);
 }
 
 - (BOOL)isRequired {
@@ -998,7 +998,7 @@ - (instancetype)copyWithZone:(NSZone *)zone {
 }
 
 - (NSString *)singletonName {
-  return @(description_->singletonName);
+  return (NSString * _Nonnull)@(description_->singletonName);
 }
 
 - (const char *)singletonNameC {

objectivec/GPBDictionary.m

@@ -12102,14 +12102,14 @@ - (void)setObject:(id)obj forKeyedSubscript:(id<NSCopying>)key {
   }
 }
 
-- (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id key,
+- (void)enumerateKeysAndObjectsUsingBlock:(void (NS_NOESCAPE ^)(id key,
                                                     id obj,
                                                     BOOL *stop))block {
   [_dictionary enumerateKeysAndObjectsUsingBlock:block];
 }
 
 - (void)enumerateKeysAndObjectsWithOptions:(NSEnumerationOptions)opts
-                                usingBlock:(void (^)(id key,
+                                usingBlock:(void (NS_NOESCAPE ^)(id key,
                                                      id obj,
                                                      BOOL *stop))block {
   [_dictionary enumerateKeysAndObjectsWithOptions:opts usingBlock:block];

objectivec/README.md

@@ -13,7 +13,7 @@ Requirements
 The Objective C implementation requires:
 
 - Objective C 2.0 Runtime (32bit & 64bit iOS, 64bit OS X).
-- Xcode 7.0 (or later).
+- Xcode 8.0 (or later).
 - The library code does *not* use ARC (for performance reasons), but it all can
   be called from ARC code.