summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2017-08-18 09:57:40 -0400
committerGitHub <noreply@github.com>2017-08-18 09:57:40 -0400
commitb4e4918d9a1021e51f858df2ac6aa8f1472d4093 (patch)
tree3188e4adcec6b8e1ef38ae8f04879e71e4bf8863
parent4fd91c7ac2ba08780111584cf8e6dbb4725b1adf (diff)
parent43af4f5a5ea8ea793df57afb293fe2177cb9a6a1 (diff)
downloadsdl_ios-b4e4918d9a1021e51f858df2ac6aa8f1472d4093.tar.gz
Merge pull request #694 from smartdevicelink/bugfix/RPCs_as_public_files
RPCs as Public Files
-rw-r--r--SmartDeviceLink-iOS.podspec6
-rw-r--r--SmartDeviceLink-iOS.xcodeproj/project.pbxproj6
-rw-r--r--SmartDeviceLink.podspec10
-rw-r--r--SmartDeviceLink/SmartDeviceLink.h4
4 files changed, 19 insertions, 7 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index a1600dd04..8db70e206 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -197,9 +197,11 @@ s.public_header_files = [
'SmartDeviceLink/SDLTouchEvent.h',
'SmartDeviceLink/SDLTouchEventCapabilities.h',
'SmartDeviceLink/SDLTurn.h',
-'SmartDeviceLink/SDLVRHelpItem.h',
'SmartDeviceLink/SDLVehicleDataResult.h',
'SmartDeviceLink/SDLVehicleType.h',
+'SmartDeviceLink/SDLVideoStreamingFormat.h',
+'SmartDeviceLink/SDLVideoStreamingCapability.h'
+'SmartDeviceLink/SDLVRHelpItem.h',
'SmartDeviceLink/SDLAmbientLightStatus.h',
'SmartDeviceLink/SDLAppHMIType.h',
'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h',
@@ -270,6 +272,8 @@ s.public_header_files = [
'SmartDeviceLink/SDLVehicleDataResultCode.h',
'SmartDeviceLink/SDLVehicleDataStatus.h',
'SmartDeviceLink/SDLVehicleDataType.h',
+'SmartDeviceLink/SDLVideoStreamingCodec.h',
+'SmartDeviceLink/SDLVideoStreamingProtocol.h',
'SmartDeviceLink/SDLWarningLightStatus.h',
'SmartDeviceLink/SDLWaypointType.h',
'SmartDeviceLink/SDLWiperStatus.h',
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index c147bd893..9806b0777 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -944,11 +944,11 @@
8B06062C1F310ED2005ADB2F /* SDLMetadataTagsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06062B1F310ED2005ADB2F /* SDLMetadataTagsSpec.m */; };
8BD729A61F2A2CF30029AC93 /* SDLVideoStreamingCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729A41F2A2CF30029AC93 /* SDLVideoStreamingCodec.h */; };
8BD729A71F2A2CF30029AC93 /* SDLVideoStreamingCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729A51F2A2CF30029AC93 /* SDLVideoStreamingCodec.m */; };
- 8BD729AA1F2A41F40029AC93 /* SDLVideoStreamingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729A81F2A41F40029AC93 /* SDLVideoStreamingProtocol.h */; };
+ 8BD729AA1F2A41F40029AC93 /* SDLVideoStreamingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729A81F2A41F40029AC93 /* SDLVideoStreamingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
8BD729AB1F2A41F40029AC93 /* SDLVideoStreamingProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729A91F2A41F40029AC93 /* SDLVideoStreamingProtocol.m */; };
- 8BD729AE1F2A5AA10029AC93 /* SDLVideoStreamingFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729AC1F2A5AA10029AC93 /* SDLVideoStreamingFormat.h */; };
+ 8BD729AE1F2A5AA10029AC93 /* SDLVideoStreamingFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729AC1F2A5AA10029AC93 /* SDLVideoStreamingFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
8BD729AF1F2A5AA10029AC93 /* SDLVideoStreamingFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729AD1F2A5AA10029AC93 /* SDLVideoStreamingFormat.m */; };
- 8BD729B21F2A61DF0029AC93 /* SDLVideoStreamingCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729B01F2A61DF0029AC93 /* SDLVideoStreamingCapability.h */; };
+ 8BD729B21F2A61DF0029AC93 /* SDLVideoStreamingCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729B01F2A61DF0029AC93 /* SDLVideoStreamingCapability.h */; settings = {ATTRIBUTES = (Public, ); }; };
8BD729B31F2A61DF0029AC93 /* SDLVideoStreamingCapability.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729B11F2A61DF0029AC93 /* SDLVideoStreamingCapability.m */; };
8BD729B51F2A711D0029AC93 /* SDLVideoStreamingCodecSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729B41F2A711D0029AC93 /* SDLVideoStreamingCodecSpec.m */; };
8BD729B71F2A75FD0029AC93 /* SDLVideoStreamingProtocolSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729B61F2A75FD0029AC93 /* SDLVideoStreamingProtocolSpec.m */; };
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index e5eea9b4b..bb12c8bac 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -176,6 +176,7 @@ s.public_header_files = [
'SmartDeviceLink/SDLImageResolution.h',
'SmartDeviceLink/SDLKeyboardProperties.h',
'SmartDeviceLink/SDLMenuParams.h',
+'SmartDeviceLink/SDLMetadataTags.h',
'SmartDeviceLink/SDLMyKey.h',
'SmartDeviceLink/SDLNavigationCapability.h',
'SmartDeviceLink/SDLOasisAddress.h',
@@ -197,9 +198,11 @@ s.public_header_files = [
'SmartDeviceLink/SDLTouchEvent.h',
'SmartDeviceLink/SDLTouchEventCapabilities.h',
'SmartDeviceLink/SDLTurn.h',
-'SmartDeviceLink/SDLVRHelpItem.h',
'SmartDeviceLink/SDLVehicleDataResult.h',
'SmartDeviceLink/SDLVehicleType.h',
+'SmartDeviceLink/SDLVideoStreamingFormat.h',
+'SmartDeviceLink/SDLVideoStreamingCapability.h'
+'SmartDeviceLink/SDLVRHelpItem.h',
'SmartDeviceLink/SDLAmbientLightStatus.h',
'SmartDeviceLink/SDLAppHMIType.h',
'SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h',
@@ -240,6 +243,7 @@ s.public_header_files = [
'SmartDeviceLink/SDLLockScreenStatus.h',
'SmartDeviceLink/SDLMaintenanceModeStatus.h',
'SmartDeviceLink/SDLMediaClockFormat.h',
+'SmartDeviceLink/SDLMetadataType.h',
'SmartDeviceLink/SDLPRNDL.h',
'SmartDeviceLink/SDLPermissionStatus.h',
'SmartDeviceLink/SDLPowerModeQualificationStatus.h',
@@ -270,6 +274,8 @@ s.public_header_files = [
'SmartDeviceLink/SDLVehicleDataResultCode.h',
'SmartDeviceLink/SDLVehicleDataStatus.h',
'SmartDeviceLink/SDLVehicleDataType.h',
+'SmartDeviceLink/SDLVideoStreamingCodec.h',
+'SmartDeviceLink/SDLVideoStreamingProtocol.h',
'SmartDeviceLink/SDLWarningLightStatus.h',
'SmartDeviceLink/SDLWaypointType.h',
'SmartDeviceLink/SDLWiperStatus.h',
@@ -291,8 +297,6 @@ s.public_header_files = [
'SmartDeviceLink/SDLRequestHandler.h',
'SmartDeviceLink/SDLRPCNotificationNotification.h',
'SmartDeviceLink/SDLRPCResponseNotification.h',
-'SmartDeviceLink/SDLMetadataTags.h',
-'SmartDeviceLink/SDLMetadataType.h'
]
end
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 798866fbf..6a5240b85 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -222,6 +222,8 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
#import "SDLTurn.h"
#import "SDLVehicleDataResult.h"
#import "SDLVehicleType.h"
+#import "SDLVideoStreamingCapability.h"
+#import "SDLVideoStreamingFormat.h"
#import "SDLVrHelpItem.h"
// Enums
@@ -293,6 +295,8 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
#import "SDLVehicleDataResultCode.h"
#import "SDLVehicleDataStatus.h"
#import "SDLVehicleDataType.h"
+#import "SDLVideoStreamingCodec.h"
+#import "SDLVideoStreamingProtocol.h"
#import "SDLVrCapabilities.h"
#import "SDLWarningLightStatus.h"
#import "SDLWaypointType.h"