Merge branch 'develop' into feature/sdl_0009_prefer_nonatomic

# Conflicts:
#	SmartDeviceLink/SDLAbstractProtocol.h
#	SmartDeviceLink/SDLAbstractTransport.h
#	SmartDeviceLink/SDLAddCommand.h
#	SmartDeviceLink/SDLAddSubMenu.h
#	SmartDeviceLink/SDLAlert.h
#	SmartDeviceLink/SDLAlertManeuver.h
#	SmartDeviceLink/SDLAlertResponse.h
#	SmartDeviceLink/SDLBodyInformation.h
#	SmartDeviceLink/SDLChoice.h
#	SmartDeviceLink/SDLDIDResult.h
#	SmartDeviceLink/SDLDeviceInfo.h
#	SmartDeviceLink/SDLDisplayCapabilities.h
#	SmartDeviceLink/SDLGetDTCs.h
#	SmartDeviceLink/SDLGetVehicleData.h
#	SmartDeviceLink/SDLGetVehicleDataResponse.h
#	SmartDeviceLink/SDLGetWaypointsResponse.h
#	SmartDeviceLink/SDLHeadLampStatus.h
#	SmartDeviceLink/SDLIAPSession.h
#	SmartDeviceLink/SDLIAPTransport.h
#	SmartDeviceLink/SDLIAPTransport.m
#	SmartDeviceLink/SDLImageField.h
#	SmartDeviceLink/SDLKeyboardProperties.h
#	SmartDeviceLink/SDLListFilesResponse.h
#	SmartDeviceLink/SDLLocationDetails.h
#	SmartDeviceLink/SDLMenuParams.h
#	SmartDeviceLink/SDLObjectWithPriority.h
#	SmartDeviceLink/SDLOnButtonEvent.h
#	SmartDeviceLink/SDLOnButtonPress.h
#	SmartDeviceLink/SDLOnEncodedSyncPData.h
#	SmartDeviceLink/SDLOnKeyboardInput.h
#	SmartDeviceLink/SDLOnSyncPData.h
#	SmartDeviceLink/SDLOnSystemRequest.h
#	SmartDeviceLink/SDLOnVehicleData.h
#	SmartDeviceLink/SDLPerformAudioPassThru.h
#	SmartDeviceLink/SDLPerformInteraction.h
#	SmartDeviceLink/SDLPerformInteractionResponse.h
#	SmartDeviceLink/SDLProtocol.m
#	SmartDeviceLink/SDLProtocolMessage.h
#	SmartDeviceLink/SDLProtocolMessage.m
#	SmartDeviceLink/SDLProtocolMessageAssembler.h
#	SmartDeviceLink/SDLProtocolReceivedMessageRouter.h
#	SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
#	SmartDeviceLink/SDLProxy.h
#	SmartDeviceLink/SDLProxy.m
#	SmartDeviceLink/SDLPutFile.h
#	SmartDeviceLink/SDLRPCMessage.h
#	SmartDeviceLink/SDLRPCPayload.h
#	SmartDeviceLink/SDLRPCResponse.h
#	SmartDeviceLink/SDLReadDIDResponse.h
#	SmartDeviceLink/SDLRegisterAppInterface.h
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
#	SmartDeviceLink/SDLScreenParams.h
#	SmartDeviceLink/SDLScrollableMessage.h
#	SmartDeviceLink/SDLSetDisplayLayoutResponse.h
#	SmartDeviceLink/SDLSetGlobalProperties.h
#	SmartDeviceLink/SDLSetMediaClockTimer.h
#	SmartDeviceLink/SDLShow.h
#	SmartDeviceLink/SDLShowConstantTBT.h
#	SmartDeviceLink/SDLSlider.h
#	SmartDeviceLink/SDLSliderResponse.h
#	SmartDeviceLink/SDLSoftButton.h
#	SmartDeviceLink/SDLSubscribeVehicleData.h
#	SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
#	SmartDeviceLink/SDLSystemRequest.h
#	SmartDeviceLink/SDLTimer.h
#	SmartDeviceLink/SDLTimer.m
#	SmartDeviceLink/SDLTurn.h
#	SmartDeviceLink/SDLUnsubscribeVehicleData.h
#	SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
#	SmartDeviceLink/SDLUpdateTurnList.h
#	SmartDeviceLink/SDLVehicleType.h
#	SmartDeviceLink/SDLVrHelpItem.h

1 files changed, 13 insertions, 8 deletions

diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h
index 107f685bd..59ef5cb02 100644
--- a/SmartDeviceLink/SDLAddCommand.h
+++ b/SmartDeviceLink/SDLAddCommand.h
@@ -34,6 +34,9 @@
  *
  * @see SDLDeleteCommand SDLAddSubMenu SDLDeleteSubMenu
  */
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SDLAddCommand : SDLRPCRequest <SDLRequestHandler>
 
 /**
@@ -43,20 +46,20 @@
  *
  *  @return An SDLAddCommand object
  */
-- (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler;
+- (instancetype)initWithHandler:(nullable SDLRPCNotificationHandler)handler;
 
-- (instancetype)initWithId:(UInt32)commandId vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler;
+- (instancetype)initWithId:(UInt32)commandId vrCommands:(nullable NSArray<NSString *> *)vrCommands handler:(nullable SDLRPCNotificationHandler)handler;
 
-- (instancetype)initWithId:(UInt32)commandId vrCommands:(NSArray<NSString *> *)vrCommands menuName:(NSString *)menuName handler:(SDLRPCNotificationHandler)handler;
+- (instancetype)initWithId:(UInt32)commandId vrCommands:(nullable NSArray<NSString *> *)vrCommands menuName:(NSString *)menuName handler:(SDLRPCNotificationHandler)handler;
 
-- (instancetype)initWithId:(UInt32)commandId vrCommands:(NSArray<NSString *> *)vrCommands menuName:(NSString *)menuName parentId:(UInt32)parentId position:(UInt16)position iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler;
+- (instancetype)initWithId:(UInt32)commandId vrCommands:(nullable NSArray<NSString *> *)vrCommands menuName:(NSString *)menuName parentId:(UInt32)parentId position:(UInt16)position iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(nullable SDLRPCNotificationHandler)handler;
 
 /**
  *  A handler that will let you know when the button you created is subscribed.
  *
  *  @warning This will only work if you use SDLManager.
  */
-@property (copy, nonatomic) SDLRPCNotificationHandler handler;
+@property (nullable, copy, nonatomic) SDLRPCNotificationHandler handler;
 
 /**
  * @abstract A Unique Command ID that identifies the command
@@ -77,7 +80,7 @@
  *
  * Optional
  */
-@property (strong, nonatomic) SDLMenuParams *menuParams;
+@property (nullable, strong, nonatomic) SDLMenuParams *menuParams;
 
 /**
  * @abstract An array of strings to be used as VR synonyms for this command.
@@ -88,7 +91,7 @@
  *
  * Optional, Array of Strings, Max String length 99 chars, Array size 1 - 100
  */
-@property (strong, nonatomic) NSMutableArray<NSString *> *vrCommands;
+@property (nullable, strong, nonatomic) NSMutableArray<NSString *> *vrCommands;
 
 /**
  * @abstract Image struct containing a static or dynamic icon
@@ -99,6 +102,8 @@
  *
  * Optional
  */
-@property (strong, nonatomic) SDLImage *cmdIcon;
+@property (nullable, strong, nonatomic) SDLImage *cmdIcon;
 
 @end
+
+NS_ASSUME_NONNULL_END