diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2019-04-17 10:54:28 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2019-04-17 10:54:28 -0400 |
commit | e83766b0d5c90eb774d684d06d592aeb42cab5a1 (patch) | |
tree | a3eee49c3190841c65809ed062cc20ab64acd990 | |
parent | c32b0909ad8f6db7cdff0a98829ef00d283a6548 (diff) | |
parent | dbcb08c56956f8c5a8491c47b4999030ee77a3c0 (diff) | |
download | sdl_ios-e83766b0d5c90eb774d684d06d592aeb42cab5a1.tar.gz |
Merge branch 'master' into develop
-rw-r--r-- | .swift-version | 1 | ||||
-rw-r--r-- | SmartDeviceLink.podspec | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d5496..000000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index 96dacd733..6cfe4126f 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -422,6 +422,7 @@ end s.subspec 'Swift' do |sswift| sswift.dependency 'SmartDeviceLink/Default' sswift.source_files = 'SmartDeviceLinkSwift/*.swift' +sswift.swift_version = '4.2' end end |