diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-02-20 10:43:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 10:43:26 -0500 |
| commit | 8fda95124154dcb6fe17af5d527f0a630d7ad9c4 (patch) | |
| tree | 1cb0f198c37fd0cf55fec5af5d33e95f4a1d437f | |
| parent | 9d783d9cc4e4d5f712ae1772afcfb272ea23c61a (diff) | |
| parent | a28888f62dd1431a62e0004bda2b5dc074672edd (diff) | |
| download | sdl_ios-8fda95124154dcb6fe17af5d527f0a630d7ad9c4.tar.gz | |
Merge pull request #533 from smartdevicelink/hotfix/xcode_83_fixes
Xcode 8.3 beta 2 fixes
| -rw-r--r-- | SmartDeviceLink/SDLConsoleController.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLFileManager.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLPerformInteraction.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLPermissionManager.m | 4 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLRegisterAppInterfaceResponse.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLSetGlobalProperties.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLVrCapabilities.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLVrHelpItem.m | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/SmartDeviceLink/SDLConsoleController.m b/SmartDeviceLink/SDLConsoleController.m index ade1c17df..fcbcd78a7 100644 --- a/SmartDeviceLink/SDLConsoleController.m +++ b/SmartDeviceLink/SDLConsoleController.m @@ -3,7 +3,7 @@ #import "SDLConsoleController.h" -#import "SDLJSONEncoder.h" +#import "SDLJsonEncoder.h" #import "SDLRPCResponse.h" diff --git a/SmartDeviceLink/SDLFileManager.m b/SmartDeviceLink/SDLFileManager.m index 86507224b..0321691ac 100644 --- a/SmartDeviceLink/SDLFileManager.m +++ b/SmartDeviceLink/SDLFileManager.m @@ -40,7 +40,7 @@ SDLFileManagerState *const SDLFileManagerStateStartupError = @"StartupError"; @property (weak, nonatomic) id<SDLConnectionManagerType> connectionManager; // Remote state -@property (copy, nonatomic, readwrite) NSMutableSet<SDLFileName *> *mutableRemoteFileNames; +@property (strong, nonatomic, readwrite) NSMutableSet<SDLFileName *> *mutableRemoteFileNames; @property (assign, nonatomic, readwrite) NSUInteger bytesAvailable; // Local state diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index 9496aa7a2..f769e835e 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -9,7 +9,7 @@ #import "SDLNames.h" #import "SDLTTSChunk.h" #import "SDLTTSChunkFactory.h" -#import "SDLVRHelpItem.h" +#import "SDLVrHelpItem.h" static UInt16 const SDLDefaultTimeout = 10000; diff --git a/SmartDeviceLink/SDLPermissionManager.m b/SmartDeviceLink/SDLPermissionManager.m index a6898ee55..af8df0ce9 100644 --- a/SmartDeviceLink/SDLPermissionManager.m +++ b/SmartDeviceLink/SDLPermissionManager.m @@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLPermissionManager () -@property (copy, nonatomic) NSMutableDictionary<SDLPermissionRPCName, SDLPermissionItem *> *permissions; -@property (copy, nonatomic) NSMutableArray<SDLPermissionFilter *> *filters; +@property (strong, nonatomic) NSMutableDictionary<SDLPermissionRPCName, SDLPermissionItem *> *permissions; +@property (strong, nonatomic) NSMutableArray<SDLPermissionFilter *> *filters; @property (copy, nonatomic, nullable) SDLHMILevel *currentHMILevel; @end diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 18356c34f..0dcab3498 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -16,7 +16,7 @@ #import "SDLSoftButtonCapabilities.h" #import "SDLSpeechCapabilities.h" #import "SDLSyncMsgVersion.h" -#import "SDLVRCapabilities.h" +#import "SDLVrCapabilities.h" #import "SDLVehicleType.h" diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index 490c1fc34..9c7a500e5 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -9,7 +9,7 @@ #import "SDLNames.h" #import "SDLTTSChunk.h" #import "SDLTTSChunkFactory.h" -#import "SDLVRHelpItem.h" +#import "SDLVrHelpItem.h" @implementation SDLSetGlobalProperties diff --git a/SmartDeviceLink/SDLVrCapabilities.m b/SmartDeviceLink/SDLVrCapabilities.m index 72c8c39d2..985d33726 100644 --- a/SmartDeviceLink/SDLVrCapabilities.m +++ b/SmartDeviceLink/SDLVrCapabilities.m @@ -2,7 +2,7 @@ // -#import "SDLVRCapabilities.h" +#import "SDLVrCapabilities.h" SDLVRCapabilities *SDLVRCapabilities_TEXT = nil; diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index 97dc86df4..b24bc9504 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -2,7 +2,7 @@ // -#import "SDLVRHelpItem.h" +#import "SDLVrHelpItem.h" #import "SDLImage.h" #import "SDLNames.h" |