Skip to content

Commit

Permalink
Merge branch 'feature/cocoapods-distribution' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLAirbagStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLAudioPassThruCapabilities.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLBeltStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLBodyInformation.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLButtonCapabilities.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLChoice.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLClusterModeStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLDIDResult.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLDeviceStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLDisplayCapabilities.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLECallInfo.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLEmergencyEvent.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLGPSData.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLGetVehicleDataResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLHeadLampStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLImage.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLImageField.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLKeyboardProperties.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenManager.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLLockScreenStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLMyKey.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonPress.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnCommand.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnDriverDistraction.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnHMIStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnKeyboardInput.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLanguageChange.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLockScreenStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnSystemRequest.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTBTClientState.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTouchEvent.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLOnVehicleData.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformAudioPassThru.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLPermissionItem.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLProxyListener.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLPutFile.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCRequestFactory.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLScreenParams.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSetDisplayLayoutResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSetGlobalProperties.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSetMediaClockTimer.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLShow.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLShowConstantTBT.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSingleTireStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSoftButton.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeButton.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLSystemRequest.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunk.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunkFactory.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLTextField.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLTireStatus.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLTurn.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeButton.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.h
	SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.h
  • Loading branch information
Joel Fischer committed Mar 4, 2015
2 parents 5f4faaa + 483e2b0 commit aea6558
Show file tree
Hide file tree
Showing 527 changed files with 5,635 additions and 3,585 deletions.
14 changes: 14 additions & 0 deletions SmartDeviceLink-iOS.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Pod::Spec.new do |s|

s.name = "SmartDeviceLink-iOS"
s.version = "3.0.0"
s.summary = "Connect your app with cars!"
s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
s.license = { :type => "New BSD", :file => "LICENSE" }
s.author = { "SmartDeviceLink Team" => "joel@livioradio.com" }
s.platform = :ios, "7.0"
s.source = { :git => "https://github.com/smartdevicelink/SmartDeviceLink-iOS.git", :tag => "3.0.0" }
s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}"
s.requires_arc = true

end
2,888 changes: 2,888 additions & 0 deletions SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
BuildableName = "SmartDeviceLink.framework"
BlueprintName = "SmartDeviceLink"
ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5D61FA251A84237100846EE7"
BuildableName = "SmartDeviceLinkTests.xctest"
BlueprintName = "SmartDeviceLinkTests"
ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
BuildableName = "SmartDeviceLink.framework"
BlueprintName = "SmartDeviceLink"
ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
BuildableName = "SmartDeviceLink.framework"
BlueprintName = "SmartDeviceLink"
ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
BuildableName = "SmartDeviceLink.framework"
BlueprintName = "SmartDeviceLink"
ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLProtocol.h>
#import <SmartDeviceLink/SDLProxyListener.h>
#import <SmartDeviceLink/SDLRPCMessage.h>
#import <SmartDeviceLink/SDLTransport.h>

#import "SDLProtocol.h"
#import "SDLProxyListener"
#import "SDLRPCMessage"
#import "SDLTransport"

@protocol ISDLProxy

Expand Down
26 changes: 26 additions & 0 deletions SmartDeviceLink-iOS/SmartDeviceLink/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.smartdevicelink.smartdevicelink</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>

#import "SDLInterfaceProtocol.h"
#import "SDLTransport.h"
#import "SDLProtocolListener.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
@import Foundation;

#import "SDLTransport.h"
#import "SDLTransportDelegate.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCRequest.h>

#import <SmartDeviceLink/SDLMenuParams.h>
#import <SmartDeviceLink/SDLImage.h>
#import "SDLRPCRequest.h"

#import "SDLMenuParams.h"
#import "SDLImage.h"

@interface SDLAddCommand : SDLRPCRequest {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAddCommand.h>
#import "SDLAddCommand.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAddCommand

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCResponse.h>

#import "SDLRPCResponse.h"

@interface SDLAddCommandResponse : SDLRPCResponse {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAddCommandResponse.h>
#import "SDLAddCommandResponse.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAddCommandResponse

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCRequest.h>

#import "SDLRPCRequest.h"

@interface SDLAddSubMenu : SDLRPCRequest {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAddSubMenu.h>
#import "SDLAddSubMenu.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAddSubMenu

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCResponse.h>

#import "SDLRPCResponse.h"

@interface SDLAddSubMenuResponse : SDLRPCResponse {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAddSubMenuResponse.h>
#import "SDLAddSubMenuResponse.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAddSubMenuResponse

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCMessage.h>

#import <SmartDeviceLink/SDLVehicleDataEventStatus.h>
#import "SDLRPCMessage.h"

#import "SDLVehicleDataEventStatus.h"

@interface SDLAirbagStatus : SDLRPCStruct {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAirbagStatus.h>
#import "SDLAirbagStatus.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAirbagStatus

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCRequest.h>

#import "SDLRPCRequest.h"

@interface SDLAlert : SDLRPCRequest {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAlert.h>
#import "SDLAlert.h"

#import <SmartDeviceLink/SDLNames.h>
#import <SmartDeviceLink/SDLTTSChunk.h>
#import <SmartDeviceLink/SDLSoftButton.h>
#import "SDLNames.h"
#import "SDLTTSChunk.h"
#import "SDLSoftButton.h"

@implementation SDLAlert

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCRequest.h>

#import "SDLRPCRequest.h"

@interface SDLAlertManeuver : SDLRPCRequest {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAlertManeuver.h>
#import "SDLAlertManeuver.h"

#import <SmartDeviceLink/SDLNames.h>
#import <SmartDeviceLink/SDLTTSChunk.h>
#import <SmartDeviceLink/SDLSoftButton.h>
#import "SDLNames.h"
#import "SDLTTSChunk.h"
#import "SDLSoftButton.h"

@implementation SDLAlertManeuver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCResponse.h>

#import "SDLRPCResponse.h"

@interface SDLAlertManeuverResponse : SDLRPCResponse {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <SmartDeviceLink/SDLAlertManeuverResponse.h>
#import "SDLAlertManeuverResponse.h"

#import <SmartDeviceLink/SDLNames.h>
#import "SDLNames.h"

@implementation SDLAlertManeuverResponse

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// Copyright (c) 2014 Ford Motor Company. All rights reserved.

#import <Foundation/Foundation.h>
#import <SmartDeviceLink/SDLRPCResponse.h>

#import "SDLRPCResponse.h"

@interface SDLAlertResponse : SDLRPCResponse {}

Expand Down

0 comments on commit aea6558

Please sign in to comment.