Update runtime to use block-based IMPs; add macros for Objective-C generics; update project files.

Author: grobbins

Source/GTL.xcodeproj/project.pbxproj

@@ -797,7 +797,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0440;
+				LastUpgradeCheck = 0630;
 			};
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "GTL" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1032,23 +1032,18 @@
 		1DEB913F08733D840010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				CLANG_STATIC_ANALYZER_MODE = deep;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
 				DEPLOYMENT_POSTPROCESSING = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = "";
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DDEBUG=1";
 				SDKROOT = macosx;
 				WARNING_CFLAGS = (
@@ -1075,23 +1070,17 @@
 		1DEB914008733D840010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				CLANG_STATIC_ANALYZER_MODE = deep;
 				COPY_PHASE_STRIP = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = "";
 				SDKROOT = macosx;
 				WARNING_CFLAGS = (
 					"-Wall",
@@ -1117,13 +1106,11 @@
 		4F14A9E00B1276B70072EBB8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(value)",
 					"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
 				);
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
@@ -1146,13 +1133,11 @@
 		4F14A9E10B1276B70072EBB8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(value)",
 					"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
 				);
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
@@ -1175,8 +1160,6 @@
 		4F1AD9090B71606100DC0485 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				GCC_ENABLE_OBJC_GC = unsupported;
 				INFOPLIST_FILE = "Resources/DevTestTool-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = DevelopmentTestTool;
@@ -1186,8 +1169,6 @@
 		4F1AD90A0B71606100DC0485 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				GCC_ENABLE_OBJC_GC = unsupported;
 				INFOPLIST_FILE = "Resources/DevTestTool-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = DevelopmentTestTool;
@@ -1223,7 +1204,6 @@
 		4F38F7120B66EF2C00B24B81 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -1247,7 +1227,6 @@
 		4F38F7130B66EF2C00B24B81 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

Source/GTLDefines.h

@@ -138,3 +138,25 @@
     #define GTL_NONNULL(x)
   #endif
 #endif
+
+#ifndef GTL_DECLARE_GENERICS
+  #if __has_feature(objc_generics) \
+    && ((!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
+      || (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0))
+    #define GTL_DECLARE_GENERICS 1
+  #else
+    #define GTL_DECLARE_GENERICS 0
+  #endif
+#endif
+
+#ifndef GTL_NSArrayOf
+  #if GTL_DECLARE_GENERICS
+    #define GTL_NSArrayOf(value) NSArray<value>
+    #define GTL_NSDictionaryOf(key, value) NSDictionary<key, value>
+    #define GTL_NSMutableDictionaryOf(key, value) NSMutableDictionary<key, value>
+  #else
+    #define GTL_NSArrayOf(value) NSArray
+    #define GTL_NSDictionaryOf(key, value) NSDictionary
+    #define GTL_NSMutableDictionaryOf(key, value) NSMutableDictionary
+  #endif // GTL_DECLARE_GENERICS
+#endif  // GTL_NSArrayOf

Source/Objects/GTLBatchQuery.h

@@ -33,7 +33,7 @@
 }
 
 // Queries included in this batch.  Each query should have a unique requestID.
-@property (retain) NSArray *queries;
+@property (retain) GTL_NSArrayOf(GTLQuery *) *queries;
 
 // Clients may set this to YES to disallow authorization. Defaults to NO.
 @property (assign) BOOL shouldSkipAuthorization;
@@ -42,11 +42,11 @@
 //
 // These headers override the same keys from the service object's
 // additionalHTTPHeaders.
-@property (copy) NSDictionary *additionalHTTPHeaders;
+@property (copy) GTL_NSDictionaryOf(NSString *, NSString *) *additionalHTTPHeaders;
 
 // Any URL query parameters to add to the query (useful for debugging with some
 // services).
-@property (copy) NSDictionary *urlQueryParameters;
+@property (copy) GTL_NSDictionaryOf(NSString *, NSString *) *urlQueryParameters;
 
 // Apps may provide a test block on the query or service to avoid network activity
 // during testing.
@@ -55,7 +55,7 @@
 @property (copy) GTLQueryTestBlock testBlock;
 
 + (instancetype)batchQuery;
-+ (instancetype)batchQueryWithQueries:(NSArray *)array;
++ (instancetype)batchQueryWithQueries:(GTL_NSArrayOf(GTLQuery *) *)array;
 
 - (void)addQuery:(GTLQuery *)query GTL_NONNULL((1));
 

Source/Objects/GTLDateTime.m

@@ -510,12 +510,12 @@ - (void)setFromRFC3339String:(NSString *)str {
   NSInteger totalOffset = kGTLUndefinedDateComponent;
   self.universalTime = NO;
 
-  if (sign != nil && [sign caseInsensitiveCompare:@"Z"] == NSOrderedSame) {
+  if (sign == nil || [sign caseInsensitiveCompare:@"Z"] == NSOrderedSame) {
 
     self.universalTime = YES;
     totalOffset = 0;
 
-  } else if (sign != nil) {
+  } else {
 
     totalOffset = (60 * offsetMinute) + (60 * 60 * offsetHour);
 

Source/Objects/GTLErrorObject.h

@@ -24,7 +24,7 @@
 @interface GTLErrorObject : GTLObject
 @property (retain) NSNumber *code;
 @property (retain) NSString *message;
-@property (retain) NSArray *data; // of GTLErrorObjectData
+@property (retain) GTL_NSArrayOf(GTLErrorObjectData *) *data;
 
 // Convenience accessor for creating an NSError from a GTLErrorObject.
 @property (readonly) NSError *foundationError;

Source/Objects/GTLObject.h

@@ -26,9 +26,11 @@
 #import "GTLUtilities.h"
 #import "GTLDateTime.h"
 
+@class GTLObject;
+
 @protocol GTLCollectionProtocol
 @optional
-@property (retain) NSArray *items;
+@property (retain) GTL_NSArrayOf(GTLObject *) *items;
 @end
 
 @protocol GTLBatchItemCreationProtocol
@@ -52,9 +54,9 @@
   NSMutableDictionary *userProperties_;
 }
 
-@property (nonatomic, retain) NSMutableDictionary *JSON;
-@property (nonatomic, retain) NSDictionary *surrogates;
-@property (nonatomic, retain) NSMutableDictionary *userProperties;
+@property (nonatomic, retain) GTL_NSMutableDictionaryOf(id, id) *JSON;
+@property (nonatomic, retain) GTL_NSDictionaryOf(Class, Class) *surrogates;
+@property (nonatomic, retain) GTL_NSMutableDictionaryOf(NSString *, id) *userProperties;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -76,13 +78,13 @@
 
 // Returns the list of keys in this object's JSON that aren't listed as
 // properties on the object.
-- (NSArray *)additionalJSONKeys;
+- (GTL_NSArrayOf(NSString *) *)additionalJSONKeys;
 
 // Any keys in the JSON that aren't listed as @properties on the object
 // are counted as "additional properties".  These allow you to get/set them.
 - (id)additionalPropertyForName:(NSString *)name;
 - (void)setAdditionalProperty:(id)obj forName:(NSString *)name GTL_NONNULL((2));
-- (NSDictionary *)additionalProperties;
+- (GTL_NSDictionaryOf(NSString *, id) *)additionalProperties;
 
 // User properties are supported for client convenience, but are not copied by
 // copyWithZone.  User Properties keys beginning with _ are reserved by the library.
@@ -184,7 +186,7 @@
 @end
 
 @interface GTLCollectionObject (DynamicMethods)
-- (NSArray *)items;
+- (GTL_NSArrayOf(GTLObject *) *)items;
 @end
 
 // Base object use for when an service method directly returns an array instead

Source/Objects/GTLObject.m

@@ -467,7 +467,7 @@ - (NSString *)description {
     if ([rawValue isKindOfClass:[NSDictionary class]]) {
       // for dictionaries, show the list of keys:
       //   {key1,key2,key3}
-      NSString *subkeyList = [[rawValue allKeys] componentsJoinedByString:@","];
+      NSString *subkeyList = [[(NSDictionary *)rawValue allKeys] componentsJoinedByString:@","];
       value = [NSString stringWithFormat:@"{%@}", subkeyList];
     } else if ([rawValue isKindOfClass:[NSArray class]]) {
       // for arrays, show the number of items in the array:

Source/Objects/GTLQuery.h

@@ -27,8 +27,8 @@
 - (BOOL)isBatchQuery;
 - (BOOL)shouldSkipAuthorization;
 - (void)executionDidStop;
-- (NSDictionary *)additionalHTTPHeaders;
-- (NSDictionary *)urlQueryParameters;
+- (GTL_NSDictionaryOf(NSString *, NSString *) *)additionalHTTPHeaders;
+- (GTL_NSDictionaryOf(NSString *, NSString *) *)urlQueryParameters;
 - (GTLUploadParameters *)uploadParameters;
 @end
 
@@ -92,14 +92,14 @@ typedef void (^GTLQueryTestBlock)(GTLServiceTicket *testTicket, GTLQueryTestResp
 
 // Any URL query parameters to add to the query (useful for debugging with some
 // services).
-@property (copy) NSDictionary *urlQueryParameters;
+@property (copy) GTL_NSDictionaryOf(NSString *, NSString *) *urlQueryParameters;
 
 // Any additional HTTP headers for this query.  Not valid when this query
 // is added to a batch.
 //
 // These headers override the same keys from the service object's
 // additionalHTTPHeaders.
-@property (copy) NSDictionary *additionalHTTPHeaders;
+@property (copy) GTL_NSDictionaryOf(NSString *, NSString *) *additionalHTTPHeaders;
 
 // The GTLObject subclass expected for results (used if the result doesn't
 // include a kind attribute).