Merge commit 'dbe8e637d736eab90bcc0b18bf80b36a6797e618' into feature/touch-manager-car-window-sync

9 files changed, 15 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a9dd2286..79685770d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 5.0.0
+No changes since RC3
+
 # 5.0.0 Release Candidate 3 (changes since RC 2)
 ### Bug Fixes
 * Fix a possible crash if the List Files request from the FileManager fails due to disconnection or unregistration.
diff --git a/Cartfile.private b/Cartfile.private
index 0008b2028..2b696abf7 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1,6 +1,6 @@
 # github "Quick/Quick" ~> 1.1
-github "Quick/Quick" "xcode-9-fix"
+github "Quick/Quick" ~> 1.2
 github "Quick/Nimble" ~> 7.0
-github "AliSoftware/OHHTTPStubs" "master"
+github "AliSoftware/OHHTTPStubs" ~> 6.1
 github "erikdoe/ocmock" ~> 3.4
 github "facebook/ios-snapshot-test-case" ~> 2.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d909544d9..6832620d8 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "AliSoftware/OHHTTPStubs" "4dc6f36375f78c0b3cfe58d90bb8a4e21df5196e"
-github "Quick/Nimble" "v7.0.1"
-github "Quick/Quick" "a3850d0ddc18cf1e6ef17b3078c660f46888deca"
-github "erikdoe/ocmock" "v3.4"
+github "AliSoftware/OHHTTPStubs" "6.1.0"
+github "Quick/Nimble" "v7.0.3"
+github "Quick/Quick" "v1.2.0"
+github "erikdoe/ocmock" "v3.4.1"
 github "facebook/ios-snapshot-test-case" "2.1.4"
diff --git a/README.md b/README.md
index aae745ee7..a2f28392f 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartD
 In your podfile, you want to add `pod 'SmartDeviceLink', '~> 5.0'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 8.0+.
 
 ###### Swift
-If you are building a Swift app, then add this instead `pod 'SmartDeviceLink-iOS/Swift', '~> 5.0'`. Then run `pod install` in your terminal.
+If you are building a Swift app, then add this instead `pod 'SmartDeviceLink/Swift', '~> 5.0'`. Then run `pod install` in your terminal.
 
 ##### Carthage
 
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 21ec70ac2..724b14c3d 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "SmartDeviceLink-iOS"
-s.version      = "5.0.0-rc.3"
+s.version      = "5.0.0"
 s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index 34d7eb0e7..e77069eb8 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "SmartDeviceLink"
-s.version      = "5.0.0-rc.3"
+s.version      = "5.0.0"
 s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist
index cb0690f2e..e790eb616 100644
--- a/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0-rc.3</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 9bd0745c0..6f19a7686 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -41,7 +41,7 @@ typedef NSString SDLVehicleMake;
 typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
 
-NSString *const SDLProxyVersion = @"5.0.0-rc.3";
+NSString *const SDLProxyVersion = @"5.0.0";
 const float StartSessionTime = 10.0;
 const float NotifyProxyClosedDelay = 0.1;
 const int PoliciesCorrelationId = 65535;
diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist
index fc085b8a3..46063b5e1 100644
--- a/SmartDeviceLink_Example/Info.plist
+++ b/SmartDeviceLink_Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0-rc.3</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>