Skip to content
This repository was archived by the owner on Nov 23, 2024. It is now read-only.

Commit de13c2a

Browse files
author
Steven Diviney
committed
Merge pull request #125 from zendesk/sdiviney/Release-1.5.3.1
Release 1.5.3.1
2 parents 9d6b43c + 3861b30 commit de13c2a

File tree

33 files changed

+53
-33
lines changed

33 files changed

+53
-33
lines changed

SampleApp/SampleApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
837AB70F1A8E511700B86214 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 837AB70E1A8E511700B86214 /* MobileCoreServices.framework */; };
11+
83C044251BC2CD7E00B04303 /* ZendeskProviderSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83C044241BC2CD7E00B04303 /* ZendeskProviderSDK.framework */; };
1112
83D3E9A01AA9EF36006DB98C /* ZDSampleAppScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */; };
1213
973AF0231BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 973AF0221BA1C40B00CF244C /* ZDFlatArticlesTableViewController.m */; };
1314
C333A54319E29F1E0046B858 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C333A54119E29EC40046B858 /* SystemConfiguration.framework */; };
@@ -16,7 +17,6 @@
1617
C38311C41A1A358500F7979A /* ZDSampleAppConfigurationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38311C01A1A358500F7979A /* ZDSampleAppConfigurationViewController.m */; };
1718
C38311C51A1A358500F7979A /* ZDSampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38311C21A1A358500F7979A /* ZDSampleViewController.m */; };
1819
C3A2C8A11ABAD575006EA3E7 /* NSData+ZDKSampleApp.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A2C8A01ABAD575006EA3E7 /* NSData+ZDKSampleApp.m */; };
19-
C3C64A061BFE0D6E00E65980 /* ZendeskProviderSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C64A051BFE0D6E00E65980 /* ZendeskProviderSDK.framework */; };
2020
C3EF3EF61A1A1B1900168A69 /* ZDRateMyAppDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3EF3EF31A1A1B1900168A69 /* ZDRateMyAppDemoViewController.m */; };
2121
C3EF3EFB1A1A1B3700168A69 /* ZendeskSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C3EF3EF91A1A1B3700168A69 /* ZendeskSDK.bundle */; };
2222
C3EF3EFC1A1A1B3700168A69 /* ZendeskSDKStrings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C3EF3EFA1A1A1B3700168A69 /* ZendeskSDKStrings.bundle */; };
@@ -29,6 +29,7 @@
2929

3030
/* Begin PBXFileReference section */
3131
837AB70E1A8E511700B86214 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
32+
83C044241BC2CD7E00B04303 /* ZendeskProviderSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZendeskProviderSDK.framework; path = "../ZendeskSDK/build/Debug-iphoneos/ZendeskProviderSDK.framework"; sourceTree = "<group>"; };
3233
83D3E99E1AA9EF36006DB98C /* ZDSampleAppScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDSampleAppScanViewController.h; path = SampleApp/ZDSampleAppScanViewController.h; sourceTree = "<group>"; };
3334
83D3E99F1AA9EF36006DB98C /* ZDSampleAppScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ZDSampleAppScanViewController.m; path = SampleApp/ZDSampleAppScanViewController.m; sourceTree = "<group>"; };
3435
973AF0211BA1C40B00CF244C /* ZDFlatArticlesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZDFlatArticlesTableViewController.h; path = SampleApp/ZDFlatArticlesTableViewController.h; sourceTree = "<group>"; };
@@ -45,7 +46,6 @@
4546
C38311C21A1A358500F7979A /* ZDSampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ZDSampleViewController.m; path = SampleApp/ZDSampleViewController.m; sourceTree = "<group>"; };
4647
C3A2C89F1ABAD575006EA3E7 /* NSData+ZDKSampleApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+ZDKSampleApp.h"; path = "SampleApp/NSData+ZDKSampleApp.h"; sourceTree = "<group>"; };
4748
C3A2C8A01ABAD575006EA3E7 /* NSData+ZDKSampleApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSData+ZDKSampleApp.m"; path = "SampleApp/NSData+ZDKSampleApp.m"; sourceTree = "<group>"; };
48-
C3C64A051BFE0D6E00E65980 /* ZendeskProviderSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZendeskProviderSDK.framework; path = SampleApp/Frameworks/ZendeskProviderSDK.framework; sourceTree = "<group>"; };
4949
C3EF3EF21A1A1B1900168A69 /* ZDRateMyAppDemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZDRateMyAppDemoViewController.h; sourceTree = "<group>"; };
5050
C3EF3EF31A1A1B1900168A69 /* ZDRateMyAppDemoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZDRateMyAppDemoViewController.m; sourceTree = "<group>"; };
5151
C3EF3EF91A1A1B3700168A69 /* ZendeskSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ZendeskSDK.bundle; sourceTree = "<group>"; };
@@ -64,7 +64,7 @@
6464
isa = PBXFrameworksBuildPhase;
6565
buildActionMask = 2147483647;
6666
files = (
67-
C3C64A061BFE0D6E00E65980 /* ZendeskProviderSDK.framework in Frameworks */,
67+
83C044251BC2CD7E00B04303 /* ZendeskProviderSDK.framework in Frameworks */,
6868
837AB70F1A8E511700B86214 /* MobileCoreServices.framework in Frameworks */,
6969
C3EF3EFE1A1A1B5400168A69 /* ZendeskSDK.framework in Frameworks */,
7070
C333A54319E29F1E0046B858 /* SystemConfiguration.framework in Frameworks */,
@@ -167,7 +167,7 @@
167167
F160B6D01949E2D600AEF42D /* Frameworks */ = {
168168
isa = PBXGroup;
169169
children = (
170-
C3C64A051BFE0D6E00E65980 /* ZendeskProviderSDK.framework */,
170+
83C044241BC2CD7E00B04303 /* ZendeskProviderSDK.framework */,
171171
837AB70E1A8E511700B86214 /* MobileCoreServices.framework */,
172172
C3EF3EFD1A1A1B5400168A69 /* ZendeskSDK.framework */,
173173
C333A54119E29EC40046B858 /* SystemConfiguration.framework */,

SampleApp/SampleApp/Frameworks/ZendeskProviderSDK.framework/Headers/ZendeskProviderSDK.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* ZendeskProviderSDK.h
44
* ZendeskProviderSDK
55
*
6-
* Created by Zendesk on 11/25/2015
6+
* Created by Zendesk on 12/04/2015
77
*
88
* Copyright (c) 2015 Zendesk. All rights reserved.
99
*
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

SampleApp/SampleApp/Frameworks/ZendeskProviderSDK.framework/_CodeSignature/CodeResources

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@
282282
</data>
283283
<key>Headers/ZendeskProviderSDK.h</key>
284284
<data>
285-
owMAEQJEZcyDnsFH020mckDXkCE=
285+
5ZJiwwaeqGz2KvyD9jfvM/OqnRQ=
286286
</data>
287287
<key>Headers/ZendeskSDKConstants.h</key>
288288
<data>
289289
Y05PNWdNp37xHdHI99XDxV9lUl4=
290290
</data>
291291
<key>Info.plist</key>
292292
<data>
293-
1ZC/iYoEo/Hk0NqmO0Xk1TOpYnw=
293+
O8UDE9cK1XQsbYBxf2iJebSPzTU=
294294
</data>
295295
<key>Modules/module.modulemap</key>
296296
<data>
@@ -577,7 +577,7 @@
577577
</data>
578578
<key>Headers/ZendeskProviderSDK.h</key>
579579
<data>
580-
owMAEQJEZcyDnsFH020mckDXkCE=
580+
5ZJiwwaeqGz2KvyD9jfvM/OqnRQ=
581581
</data>
582582
<key>Headers/ZendeskSDKConstants.h</key>
583583
<data>
Binary file not shown.

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZDKRequests.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@
1616

1717

1818
#import <Foundation/Foundation.h>
19-
#import <ZendeskProviderSDK/ZendeskProviderSDK.h>
2019

2120

2221
#import "ZDKCreateRequestUIDelegate.h"
2322
#import "ZDKUIViewController.h"
2423

24+
25+
2526
@class ZDKRequestListTable;
27+
@class ZDKAccount;
28+
29+
30+
typedef void (^ZDKRequestSuccess) (id result);
31+
typedef void (^ZDKRequestError) (NSError *error);
32+
2633

2734
#pragma mark Request creation config
2835

@@ -127,8 +134,8 @@ typedef void (^ZDSDKConfigBlock) (ZDKAccount *account, ZDKRequestCreationConfig
127134
* @param error A block that is executed when an error occurs during submission of a request.
128135
*/
129136
+ (void) showRequestCreationWithNavController:(UINavigationController*)navController
130-
withSuccess:(ZDKAPISuccess)success
131-
andError:(ZDKAPIError)error;
137+
withSuccess:(ZDKRequestSuccess)success
138+
andError:(ZDKRequestError)error;
132139

133140

134141
/**

SampleApp/SampleApp/Frameworks/ZendeskSDK.framework/Headers/ZendeskSDK.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,8 @@
7777
#import "ZDKUIUtil.h"
7878
#import "ZDKUIViewController.h"
7979

80+
@import ZendeskProviderSDK;
81+
82+
8083

8184
#endif

0 commit comments

Comments
 (0)