Update to v4.0.0 final4.0.0

5 files changed, 16 insertions, 15 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4cab52af..5d8eaefb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,24 @@
 # 4.0.0 Release Notes (pre-release)
 
+## Final Release (2015-10-5)
+* Example app plist updated with required [ATS](https://developer.apple.com/library/prerelease/ios/technotes/App-Transport-Security-Technote/) keys.
+
 ## Release Candidate 2 (2015-09-23)
-* Fix a warning for passing in an NSUInteger to an int parameter
+* Fix a warning for passing in an NSUInteger to an int parameter.
 
 ## Release Candidate 1 (2015-09-19)
 
 ### Enhancements
 * Lock screen icon is now fetched
-* Hex string parsing is now roughly twice as fast
+* Hex string parsing is now roughly twice as fast.
 
 ### Bug Fixes
-* Web request delegates weren't always called
-* Streaming audio fixes
-* Large chunks of data passed over TCP no longer uses far too much memory
-* Xcode 7 warnings fixed
-* Test frameworks updated for Swift 2.0
-* Build server fixes
+* Web request delegates weren't always called.
+* Streaming audio fixes.
+* Large chunks of data passed over TCP no longer uses far too much memory.
+* Xcode 7 warnings fixed.
+* Test frameworks updated for Swift 2.0.
+* Build server fixes.
 
 
 ## Alpha 4 (2015-09-08)
diff --git a/README.md b/README.md
index 0fa95cee4..28e21ae83 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-##### Note: Please see the [release/4.0.0](https://github.com/smartdevicelink/sdl_ios/tree/release/4.0.0) branch of sdl_ios for the most recent version. Significant changes have been made since the latest stable release and the in-progress develop branch. When released, it will include distribution via Carthage and Cocoapods. The current release candidate has Cocoapods support, see below for installation instructions.
-
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Version](https://img.shields.io/cocoapods/v/SmartDeviceLink-iOS.svg?style=flat)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
 [![License](https://img.shields.io/cocoapods/l/SmartDeviceLink-iOS.svg?style=flat)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
@@ -33,7 +31,7 @@ See the [changelog](https://github.com/smartdevicelink/sdl_ios/blob/release/4.0.
 
 You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html).
 
-In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '4.0.0-RC.2'`. Then run `pod install` inside your terminal.
+In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '4.0.0'`. Then run `pod install` inside your terminal.
 
 ##### Carthage
 
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index ef34af1db..f1d5407db 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
 
   s.name         = "SmartDeviceLink-iOS"
-  s.version      = "4.0.0-RC.2"
+  s.version      = "4.0.0"
   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" => "joel@livio.io" }
   s.platform     = :ios, "6.0"
-  s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => "4.0.0-RC.2" }
+  s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => "4.0.0" }
   s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}"
   s.requires_arc = true
 
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist b/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist
index 88f2631aa..1bcfa6d13 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0-alpha.4</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m
index a88a662ab..561d8d2ab 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m
@@ -46,7 +46,7 @@
 typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
 
-NSString *const SDLProxyVersion = @"4.0.0-RC.2";
+NSString *const SDLProxyVersion = @"4.0.0";
 const float startSessionTime = 10.0;
 const float notifyProxyClosedDelay = 0.1;
 const int POLICIES_CORRELATION_ID = 65535;