summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2019-05-24 11:20:17 -0400
committerGitHub <noreply@github.com>2019-05-24 11:20:17 -0400
commit6db5ffa7b1b0f9b0f6cc2d9f4c8fe0784dad2147 (patch)
tree8057ee12384c95359d5ad72a4deb89ee080f75a2
parent24adfae46f9fe883ee5fe59d7a02a494b40f9662 (diff)
parent0002c558018390ef0ca8bbd5edc1cbab28af8306 (diff)
downloadsdl_ios-6db5ffa7b1b0f9b0f6cc2d9f4c8fe0784dad2147.tar.gz
Merge pull request #1281 from smartdevicelink/bugfix/issue_1280_bson_v1.2
Update BiSON dependency to v1.2.0
-rw-r--r--SmartDeviceLink-iOS.podspec2
-rw-r--r--SmartDeviceLink.podspec2
m---------bson_c_lib0
3 files changed, 2 insertions, 2 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 96c419654..116bddd48 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -7,7 +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.1.1'
+s.dependency 'BiSON', '~> 1.2.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 ec64518c4..40acabfea 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -7,7 +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.1.1'
+s.dependency 'BiSON', '~> 1.2.0'
s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
s.requires_arc = true
s.swift_version = '4.2'
diff --git a/bson_c_lib b/bson_c_lib
-Subproject 82f9e9dcb1f49811ec678a6d19d4f90da831ac0
+Subproject 5e79ef239b88246504ca8efa017479bf417c516