Merge pull request #147 from zendesk/Release-1.5.4

Releasing 1.5.4.1

Author: nsomar

README.md

@@ -1,6 +1,6 @@
 :warning: *Use of this software is subject to important terms and conditions as set forth in the License file* :warning:
 
-# Zendesk Mobile SDK for iOS 1.5.3.1
+# Zendesk Mobile SDK for iOS 1.5.4.1
 
 Zendesk SDK for mobile is a quick, convenient way to get customer support into your mobile apps. With just a few lines of code, you can provide your end users with an easy way to get in touch from any mobile app.
 

SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -29,7 +29,7 @@
 
 /* Begin PBXFileReference section */
 		837AB70E1A8E511700B86214 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
-		83C044241BC2CD7E00B04303 /* ZendeskProviderSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZendeskProviderSDK.framework; path = "../ZendeskSDK/build/Debug-iphoneos/ZendeskProviderSDK.framework"; sourceTree = "<group>"; };
+		83C044241BC2CD7E00B04303 /* ZendeskProviderSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZendeskProviderSDK.framework; path = SampleApp/Frameworks/ZendeskProviderSDK.framework; sourceTree = "<group>"; };
 		83D3E99E1AA9EF36006DB98C /* ZDSampleAppScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDSampleAppScanViewController.h; path = SampleApp/ZDSampleAppScanViewController.h; sourceTree = "<group>"; };
 		83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ZDSampleAppScanViewController.m; path = SampleApp/ZDSampleAppScanViewController.m; sourceTree = "<group>"; };
 		973AF0211BA1C40B00CF244C /* ZDFlatArticlesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDFlatArticlesTableViewController.h; path = SampleApp/ZDFlatArticlesTableViewController.h; sourceTree = "<group>"; };

…cshareddata/xcschemes/SampleApp.xcscheme …shareddata/xcschemes/SDK-Sample.xcschemeSampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme renamed to SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SDK-Sample.xcscheme SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme renamed to SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SDK-Sample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SampleApp/SampleApp/Bundles/ZendeskSDK.bundle/Info.plist

@@ -49,7 +49,7 @@
 
 
 /**
- *  List of upload tokens.
+ *  List of ZDKUploadResponse objects.
  *
  *  @since 1.3.0.1
  */

SampleApp/SampleApp/Bundles/ZendeskSDK.bundle/ModelIdentifier.plist

@@ -18,6 +18,7 @@
 #import "ZDKHelpCenterSearch.h"
 #import "ZDKHelpCenterDeflection.h"
 
+
 /**
  * Callback block.
  *

SampleApp/SampleApp/Bundles/ZendeskSDKStrings.bundle/Info.plist

@@ -3,9 +3,9 @@
  *  ZendeskProviderSDK.h
  *  ZendeskProviderSDK
  *
- *  Created by Zendesk on 12/04/2015
+ *  Created by Zendesk on 02/11/2016
  *
- *  Copyright (c) 2015 Zendesk. All rights reserved.
+ *  Copyright (c) 2016 Zendesk. All rights reserved.
  *
  *  By downloading or using the Zendesk Mobile SDK, You agree to the Zendesk Terms
  *  of Service https://www.zendesk.com/company/terms and Application Developer and API License