diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2019-10-04 15:01:27 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2019-10-04 15:01:27 -0400 |
| commit | fc874567377e1e4ec60bde079e03e2bd4b7c402f (patch) | |
| tree | e3d444b81bee17ae93103a576054d8ed4ba360e5 /SmartDeviceLink.podspec | |
| parent | 3f37df30878f6322561e06c0a39527022c9fbcd4 (diff) | |
| parent | 1f2c60ce1252587ab819d7e68a01206b0b722998 (diff) | |
| download | sdl_ios-fc874567377e1e4ec60bde079e03e2bd4b7c402f.tar.gz | |
Merge branch 'develop' into feature/issue_1276_main_menu_tiles (known broken)
# Conflicts:
# Example Apps/Example ObjC/VehicleDataManager.m
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLMenuManager.h
# SmartDeviceLink/SDLSetGlobalProperties.h
# SmartDeviceLink/SDLSetGlobalProperties.m
# SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
Diffstat (limited to 'SmartDeviceLink.podspec')
| -rw-r--r-- | SmartDeviceLink.podspec | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index cf94c0390..72bf0e170 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -59,6 +59,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLButtonName.h', 'SmartDeviceLink/SDLButtonPress.h', 'SmartDeviceLink/SDLButtonPressMode.h', +'SmartDeviceLink/SDLCancelInteraction.h', +'SmartDeviceLink/SDLCancelInteractionResponse.h', 'SmartDeviceLink/SDLCarModeStatus.h', 'SmartDeviceLink/SDLCarWindowViewController.h', 'SmartDeviceLink/SDLChangeRegistration.h', @@ -141,6 +143,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLGetFile.h', 'SmartDeviceLink/SDLGetFileResponse.h', 'SmartDeviceLink/SDLGetInteriorVehicleData.h', +'SmartDeviceLink/SDLGetInteriorVehicleDataConsent.h', +'SmartDeviceLink/SDLGetInteriorVehicleDataConsentResponse.h', 'SmartDeviceLink/SDLGetInteriorVehicleDataResponse.h', 'SmartDeviceLink/SDLGetSystemCapability.h', 'SmartDeviceLink/SDLGetSystemCapabilityResponse.h', @@ -150,6 +154,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLGetWaypointsResponse.h', 'SmartDeviceLink/SDLGlobalProperty.h', 'SmartDeviceLink/SDLGPSData.h', +'SmartDeviceLink/SDLGrid.h', 'SmartDeviceLink/SDLHapticRect.h', 'SmartDeviceLink/SDLHeadLampStatus.h', 'SmartDeviceLink/SDLHMICapabilities.h', @@ -220,6 +225,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLMetadataTags.h', 'SmartDeviceLink/SDLMetadataType.h', 'SmartDeviceLink/SDLModuleData.h', +'SmartDeviceLink/SDLModuleInfo.h', 'SmartDeviceLink/SDLModuleType.h', 'SmartDeviceLink/SDLMyKey.h', 'SmartDeviceLink/SDLNavigationAction.h', @@ -290,6 +296,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLRegisterAppInterface.h', 'SmartDeviceLink/SDLRegisterAppInterfaceResponse.h', 'SmartDeviceLink/SDLRemoteControlCapabilities.h', +'SmartDeviceLink/SDLReleaseInteriorVehicleDataModule.h', +'SmartDeviceLink/SDLReleaseInteriorVehicleDataModuleResponse.h', 'SmartDeviceLink/SDLRequestType.h', 'SmartDeviceLink/SDLResetGlobalProperties.h', 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h', @@ -312,6 +320,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLScrollableMessageResponse.h', 'SmartDeviceLink/SDLSeatControlCapabilities.h', 'SmartDeviceLink/SDLSeatControlData.h', +'SmartDeviceLink/SDLSeatLocation.h', +'SmartDeviceLink/SDLSeatLocationCapability.h', 'SmartDeviceLink/SDLSeatMemoryAction.h', 'SmartDeviceLink/SDLSeatMemoryActionType.h', 'SmartDeviceLink/SDLSupportedSeat.h', |