diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-17 11:21:55 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-08-17 11:21:55 -0400 |
| commit | 65c1966c888b6cd48fcb9934a097332e71112511 (patch) | |
| tree | bd00fb0e46793513c099f8555de75a538b7702af | |
| parent | 8bba8d8ed91e59e819d05a04099727d8e603322c (diff) | |
| parent | ed1e03b80e27e0c32e71d25299b6df0f124db943 (diff) | |
| download | sdl_ios-feature/streaming_media_manager.tar.gz | |
Merge branch 'release/5.0.0' into feature/streaming_media_managerfeature/streaming_media_manager
# Conflicts:
# SmartDeviceLink.podspec
| -rw-r--r-- | SmartDeviceLink-iOS.podspec | 1 | ||||
| -rw-r--r-- | SmartDeviceLink.podspec | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 9678d5516..8de7bca7f 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -7,6 +7,7 @@ s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" s.license = { :type => "New BSD", :file => "LICENSE" } s.author = { "SmartDeviceLink Team" => "developer@smartdevicelink.com" } s.platform = :ios, "8.0" +s.dependency 'BiSON', '~> 1.0' s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s } s.requires_arc = true s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] } diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index 901b28172..d4e962544 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -6,12 +6,18 @@ 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" => "developer@smartdevicelink.com" } -s.platform = :ios, "6.0" +s.platform = :ios, "8.0" +s.dependency 'BiSON', '~> 1.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/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] } -s.public_header_files = [ +s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] } + +s.default_subspecs = 'Default' + +s.subspec 'Default' do |ss| +ss.source_files = 'SmartDeviceLink/*.{h,m}' + +ss.public_header_files = [ 'SmartDeviceLink/NSNumber+NumberType.h', 'SmartDeviceLink/SDLAbstractProtocol.h', 'SmartDeviceLink/SDLAbstractTransport.h', @@ -298,5 +304,11 @@ s.public_header_files = [ 'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] +end + +s.subspec 'Swift' do |ss| +ss.dependency 'SmartDeviceLink-iOS/Default' +ss.source_files = 'SmartDeviceLinkSwift/*.swift' +end end |