Skip to content

Commit 8aa486a

Browse files
authored
Merge pull request #9 from thomasvl/support_nonnull
Enabling CLANG_ANALYZER_NONNULL
2 parents e2d3de0 + 988ce30 commit 8aa486a

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Source/GTLRCore.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,6 +1172,7 @@
11721172
isa = XCBuildConfiguration;
11731173
buildSettings = {
11741174
ALWAYS_SEARCH_USER_PATHS = NO;
1175+
CLANG_ANALYZER_NONNULL = YES;
11751176
CLANG_ENABLE_OBJC_ARC = YES;
11761177
CLANG_MODULES_AUTOLINK = NO;
11771178
CLANG_STATIC_ANALYZER_MODE = deep;
@@ -1244,6 +1245,7 @@
12441245
isa = XCBuildConfiguration;
12451246
buildSettings = {
12461247
ALWAYS_SEARCH_USER_PATHS = NO;
1248+
CLANG_ANALYZER_NONNULL = YES;
12471249
CLANG_ENABLE_OBJC_ARC = YES;
12481250
CLANG_MODULES_AUTOLINK = NO;
12491251
CLANG_STATIC_ANALYZER_MODE = deep;

Source/Objects/GTLRDateTime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
2626
/**
2727
* Constructor from a string representation.
2828
*/
29-
+ (instancetype)dateTimeWithRFC3339String:(nullable NSString *)str;
29+
+ (nullable instancetype)dateTimeWithRFC3339String:(nullable NSString *)str;
3030

3131
/**
3232
* Constructor from a date and time representation.

Source/Objects/GTLRRuntimeCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
3838
- (void)setCacheChild:(nullable id)obj forKey:(NSString *)key;
3939
- (nullable id)cacheChildForKey:(NSString *)key;
4040
// Object mapper.
41-
- (id<GTLRObjectClassResolver>)objectClassResolver;
41+
- (nullable id<GTLRObjectClassResolver>)objectClassResolver;
4242
// Key map
4343
+ (nullable NSDictionary<NSString *, NSString *> *)propertyToJSONKeyMapForClass:(Class<GTLRRuntimeCommon>)aClass;
4444
// Array item types

Source/Tests/GTLRObjectTest.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,8 @@ - (void)testSetAdditionalPropertiesBasicTypes {
907907
// date
908908
[GTLRTestingAdditionalPropertiesObject setAdditionalPropsClass:[GTLRDateTime class]];
909909
NSString * const dateStr = @"2011-01-14T15:00:00Z";
910-
[obj setAdditionalProperty:[GTLRDateTime dateTimeWithRFC3339String:dateStr]
910+
GTLRDateTime *dateTime = [GTLRDateTime dateTimeWithRFC3339String:dateStr];
911+
[obj setAdditionalProperty:dateTime
911912
forName:@"ap3"];
912913
expected[@"ap3"] = dateStr;
913914
XCTAssertEqualObjects(obj.JSON, expected);
@@ -1004,7 +1005,8 @@ - (void)testSetAdditionalPropertiesAnything {
10041005

10051006
// date
10061007
NSString * const dateStr = @"2011-01-14T15:00:00Z";
1007-
[obj setAdditionalProperty:[GTLRDateTime dateTimeWithRFC3339String:dateStr]
1008+
GTLRDateTime *dateTime = [GTLRDateTime dateTimeWithRFC3339String:dateStr];
1009+
[obj setAdditionalProperty:dateTime
10081010
forName:@"ap3"];
10091011
expected[@"ap3"] = dateStr;
10101012
XCTAssertEqualObjects(obj.JSON, expected);

0 commit comments

Comments
 (0)