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

Commit ff67ead

Browse files
author
Killian Smith
authored
Merge pull request #434 from zendesk/ksmith/2.1.1
Release for 2.1.1
2 parents 97d351d + 8db2340 commit ff67ead

File tree

233 files changed

+11538
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+11538
-10
lines changed

ZendeskSDK.podspec

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "ZendeskSDK"
3-
s.version = "2.1.0"
4-
s.summary = "Zendesk SDK 2.1.0"
3+
s.version = "2.1.1"
4+
s.summary = "Zendesk SDK 2.1.1"
55
s.homepage = "https://github.com/zendesk/zendesk_sdk_ios"
66
s.license = {
77
:type => 'Copyright',
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.platform = :ios, '9.0'
2121
s.requires_arc = true
2222
s.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'Security', 'MessageUI'
23-
s.swift_version = '4.1'
23+
s.swift_version = '4.2'
2424
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited)', 'CLANG_ENABLE_MODULES' => 'YES', 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES' }
2525

2626

@@ -29,24 +29,24 @@ Pod::Spec.new do |s|
2929

3030
s.subspec 'UI' do |ss|
3131
ss.platform = :ios, '9.0'
32-
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskSDK.framework'
33-
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskSDK.framework'
34-
ss.resources = ["ZendeskSDK/4.1/ZendeskSDKStrings.bundle"]
32+
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskSDK.framework'
33+
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskSDK.framework'
34+
ss.resources = ["ZendeskSDK/4.2/ZendeskSDKStrings.bundle"]
3535
ss.dependency 'ZendeskSDK/Providers'
3636
ss.dependency 'ZendeskSDK/Core'
3737
end
3838

3939
s.subspec 'Providers' do |ss|
4040
ss.platform = :ios, '9.0'
41-
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskProviderSDK.framework'
42-
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskProviderSDK.framework'
41+
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskProviderSDK.framework'
42+
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskProviderSDK.framework'
4343
ss.dependency 'ZendeskSDK/Core'
4444
end
4545

4646
s.subspec 'Core' do |ss|
4747
ss.platform = :ios, '9.0'
48-
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskCoreSDK.framework'
49-
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskCoreSDK.framework'
48+
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskCoreSDK.framework'
49+
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskCoreSDK.framework'
5050
end
5151

5252
end
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
*
3+
* ZDKAuthenticationURLProtocol.h
4+
* ZendeskSDK
5+
*
6+
* Created by Zendesk on 23/04/2015.
7+
*
8+
* Copyright (c) 2015 Zendesk. All rights reserved.
9+
*
10+
* By downloading or using the Zendesk Mobile SDK, You agree to the Zendesk Master
11+
* Subscription Agreement https://www.zendesk.com/company/customers-partners/#master-subscription-agreement and Application Developer and API License
12+
* Agreement https://www.zendesk.com/company/customers-partners/#application-developer-api-license-agreement and
13+
* acknowledge that such terms govern Your use of and access to the Mobile SDK.
14+
*
15+
*/
16+
17+
#import <Foundation/Foundation.h>
18+
19+
@interface ZDKAuthenticationURLProtocol : NSURLProtocol
20+
21+
@end
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// ZDKIdentityMigrator.h
3+
// ZendeskCoreSDK
4+
//
5+
// Created by Ronan Mchugh on 21/02/2018.
6+
// Copyright © 2018 Zendesk. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@interface ZDKIdentityMigrator : NSObject
12+
13+
- (_Nonnull instancetype)init;
14+
15+
16+
@end

0 commit comments

Comments
 (0)