diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-04-05 13:27:12 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-04-05 13:27:12 -0400 |
| commit | 6b81058b11df8079e30397d9bee6817b20d88bdb (patch) | |
| tree | 1a5624bf3ed7278e9b4d7e0530fee8dd08301e6c /SmartDeviceLink-iOS.podspec | |
| parent | 8b2dc2174cc579832d32f3d28011af595adceab6 (diff) | |
| parent | a912993d78989e288746516e35af2a25677b43ec (diff) | |
| download | sdl_ios-6b81058b11df8079e30397d9bee6817b20d88bdb.tar.gz | |
Merge branch 'develop' into feature/streaming_media_manager
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLLifecycleConfiguration.h
# SmartDeviceLink/SDLLifecycleConfiguration.m
# SmartDeviceLink/SDLStreamingMediaManager.m
# SmartDeviceLink/SDLTouchManager.m
* Removes the ability to set a video streaming background string
Diffstat (limited to 'SmartDeviceLink-iOS.podspec')
| -rw-r--r-- | SmartDeviceLink-iOS.podspec | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 073c34280..f0da6e3ae 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -8,10 +8,15 @@ s.license = { :type => "New BSD", :file => "LICENSE" } s.author = { "SmartDeviceLink Team" => "developer@smartdevicelink.com" } s.platform = :ios, "8.0" s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s } -s.source_files = "SmartDeviceLink/*.{h,m}" s.requires_arc = true s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] } -s.public_header_files = [ + +s.default_subspecs = 'Default' + +s.subspec 'Default' do |ss| +ss.source_files = 'SmartDeviceLink/*.{h,m}' + +ss.public_header_files = [ 'SmartDeviceLink/SmartDeviceLink.h', 'SmartDeviceLink/SDLJingle.h', 'SmartDeviceLink/SDLProxy.h', @@ -21,9 +26,6 @@ s.public_header_files = [ 'SmartDeviceLink/SDLStreamingMediaManager.h', 'SmartDeviceLink/SDLTouchManager.h', 'SmartDeviceLink/SDLTouchManagerDelegate.h', -'SmartDeviceLink/SDLConsoleController.h', -'SmartDeviceLink/SDLDebugTool.h', -'SmartDeviceLink/SDLDebugToolConsole.h', 'SmartDeviceLink/SDLSiphonServer.h', 'SmartDeviceLink/SDLAbstractTransport.h', 'SmartDeviceLink/SDLIAPSessionDelegate.h', @@ -285,7 +287,23 @@ s.public_header_files = [ 'SmartDeviceLink/SDLNotificationConstants.h', 'SmartDeviceLink/SDLRequestHandler.h', 'SmartDeviceLink/SDLRPCNotificationNotification.h', -'SmartDeviceLink/SDLRPCResponseNotification.h' +'SmartDeviceLink/SDLRPCResponseNotification.h', +'SmartDeviceLink/SDLLogTarget.h', +'SmartDeviceLink/SDLLogTargetAppleSystemLog.h', +'SmartDeviceLink/SDLLogTargetFile.h', +'SmartDeviceLink/SDLLogTargetOSLog.h', +'SmartDeviceLink/SDLLogFileModule.h', +'SmartDeviceLink/SDLLogFilter.h', +'SmartDeviceLink/SDLLogConstants.h', +'SmartDeviceLink/SDLLogConfiguration.h', +'SmartDeviceLink/SDLLogManager.h', +'SmartDeviceLink/SDLLogMacros.h' ] +end + +s.subspec 'Swift' do |ss| +ss.dependency 'SmartDeviceLink-iOS/Default' +ss.source_files = 'SmartDeviceLinkSwift/*.swift' +end end |