diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 10:08:08 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 10:08:08 -0700 |
| commit | db39f07624399365069ab7a0b7236f4b4ec41198 (patch) | |
| tree | cc0e2fbfab6ed9a399fc01d58bab66c9838ac733 /SmartDeviceLink-iOS.podspec | |
| parent | 8c5fe5dd8fe13b02950fbfdb5ce71b3d822abcbb (diff) | |
| parent | e220430734ed5603a7fb4c1b24d37252669b98fb (diff) | |
| download | sdl_ios-db39f07624399365069ab7a0b7236f4b4ec41198.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/issue_419_iOS6_removal
* origin/develop: (26 commits)
Changed deviceScale type to silence build warning
Change SDLRPCStruct private method to be a class method
Fixed error reference.
reverting function renaming in SDLRPCMessage.
Removed SDLJsonEncoder/Decoder.
Initial removal of SDLSiphonServer
Fixed issue with not all instances for SDLRPCMessage function rename applied.
reverting function renaming in SDLRPCMessage.
Fixed accidental function renaming.
Update lock screen to work correctly on iOS 6 - 8
Fixed issue with not being able to support both Swift 3 and pre-iOS 10 Objective-C.
Fixed an issue with cocoapods not properly loading icons on pre-iOS 8 devices.
Updated SDLFunctionID to project instead of private.
Update version checking code to use what we already use
Updated assets and support for retrieving bundle images for iOS 6 & 7.
Touched SDL Example Images.xcassets
Remove `.xctool.args` and update README with current testing information
Migrated initWithDictionary to take non-mutable dictionary as parameter.
Updated SDLFunctionID to be private.
Fixed remaining failing tests.
...
Diffstat (limited to 'SmartDeviceLink-iOS.podspec')
| -rw-r--r-- | SmartDeviceLink-iOS.podspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 278416702..dfa3e0a47 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -10,6 +10,6 @@ s.platform = :ios, "7.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.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] } end |