summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2016-08-18 14:52:50 -0400
committerJoel Fischer <joeljfischer@gmail.com>2016-08-18 14:52:50 -0400
commit13ce1878d5b13fcb4cfbb8504dadc28fce76d977 (patch)
tree466c9fefcb0730fc52983dfe953e8b3f1b6ac2ec
parent6283168cdd843759b5e7766cf09d4a2e67d76543 (diff)
downloadsdl_ios-13ce1878d5b13fcb4cfbb8504dadc28fce76d977.tar.gz
Update version to 4.2.24.2.2
-rw-r--r--CHANGELOG.md4
-rw-r--r--SmartDeviceLink-iOS.podspec2
-rw-r--r--SmartDeviceLink/Info.plist2
-rw-r--r--SmartDeviceLink_Example/Classes/ProxyManager.h2
-rw-r--r--SmartDeviceLink_Example/Classes/ProxyManager.m1
5 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00373f7e2..d6b78f2f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 4.2.2 Release Notes
+### Bug Fixes
+* Fixed HTTP URL schemes not being properly altered to HTTPS to account for App Transport Security (#432, #436).
+
# 4.2.1 Release Notes
### Bug Fixes
* Fixed SDLStreamingMediaManager encryption status not being set properly (#433, #434).
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 1f934398c..b86d029c4 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "SmartDeviceLink-iOS"
-s.version = "4.2.1"
+s.version = "4.2.2"
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 1461558ac..0c28f0027 100644
--- a/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>4.2.1</string>
+ <string>4.2.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.h b/SmartDeviceLink_Example/Classes/ProxyManager.h
index 604ffdc82..2d82bd698 100644
--- a/SmartDeviceLink_Example/Classes/ProxyManager.h
+++ b/SmartDeviceLink_Example/Classes/ProxyManager.h
@@ -4,6 +4,7 @@
#import <Foundation/Foundation.h>
+@class SDLProxy;
@class SDLStreamingMediaManager;
@@ -23,6 +24,7 @@ typedef NS_ENUM(NSUInteger, ProxyState) {
@interface ProxyManager : NSObject
@property (assign, nonatomic, readonly) ProxyState state;
+@property (strong, nonatomic) SDLProxy *proxy;
+ (instancetype)sharedManager;
- (void)startProxyWithTransportType:(ProxyTransportType)transportType;
diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m
index 355e91340..a37d5cb18 100644
--- a/SmartDeviceLink_Example/Classes/ProxyManager.m
+++ b/SmartDeviceLink_Example/Classes/ProxyManager.m
@@ -15,7 +15,6 @@ NSString *const SDLAppId = @"9999";
@interface ProxyManager () <SDLProxyListener>
-@property (strong, nonatomic) SDLProxy *proxy;
@property (assign, nonatomic, readwrite) ProxyState state;
@property (assign, nonatomic) BOOL isFirstHMIFull;
@property (assign, nonatomic) ProxyTransportType currentTransportType;