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

Commit

Permalink
Merge pull request #434 from zendesk/ksmith/2.1.1
Browse files Browse the repository at this point in the history
Release for 2.1.1
  • Loading branch information
Killian Smith authored Sep 13, 2018
2 parents 97d351d + 8db2340 commit ff67ead
Show file tree
Hide file tree
Showing 233 changed files with 11,538 additions and 10 deletions.
20 changes: 10 additions & 10 deletions ZendeskSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "ZendeskSDK"
s.version = "2.1.0"
s.summary = "Zendesk SDK 2.1.0"
s.version = "2.1.1"
s.summary = "Zendesk SDK 2.1.1"
s.homepage = "https://github.com/zendesk/zendesk_sdk_ios"
s.license = {
:type => 'Copyright',
Expand All @@ -20,7 +20,7 @@ Pod::Spec.new do |s|
s.platform = :ios, '9.0'
s.requires_arc = true
s.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'Security', 'MessageUI'
s.swift_version = '4.1'
s.swift_version = '4.2'
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited)', 'CLANG_ENABLE_MODULES' => 'YES', 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES' }


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

s.subspec 'UI' do |ss|
ss.platform = :ios, '9.0'
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskSDK.framework'
ss.resources = ["ZendeskSDK/4.1/ZendeskSDKStrings.bundle"]
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskSDK.framework'
ss.resources = ["ZendeskSDK/4.2/ZendeskSDKStrings.bundle"]
ss.dependency 'ZendeskSDK/Providers'
ss.dependency 'ZendeskSDK/Core'
end

s.subspec 'Providers' do |ss|
ss.platform = :ios, '9.0'
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskProviderSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskProviderSDK.framework'
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskProviderSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskProviderSDK.framework'
ss.dependency 'ZendeskSDK/Core'
end

s.subspec 'Core' do |ss|
ss.platform = :ios, '9.0'
ss.ios.vendored_frameworks = 'ZendeskSDK/4.1/ZendeskCoreSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.1/ZendeskCoreSDK.framework'
ss.ios.vendored_frameworks = 'ZendeskSDK/4.2/ZendeskCoreSDK.framework'
ss.preserve_paths = 'ZendeskSDK/4.2/ZendeskCoreSDK.framework'
end

end
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
*
* ZDKAuthenticationURLProtocol.h
* ZendeskSDK
*
* Created by Zendesk on 23/04/2015.
*
* Copyright (c) 2015 Zendesk. All rights reserved.
*
* By downloading or using the Zendesk Mobile SDK, You agree to the Zendesk Master
* Subscription Agreement https://www.zendesk.com/company/customers-partners/#master-subscription-agreement and Application Developer and API License
* Agreement https://www.zendesk.com/company/customers-partners/#application-developer-api-license-agreement and
* acknowledge that such terms govern Your use of and access to the Mobile SDK.
*
*/

#import <Foundation/Foundation.h>

@interface ZDKAuthenticationURLProtocol : NSURLProtocol

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// ZDKIdentityMigrator.h
// ZendeskCoreSDK
//
// Created by Ronan Mchugh on 21/02/2018.
// Copyright © 2018 Zendesk. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface ZDKIdentityMigrator : NSObject

- (_Nonnull instancetype)init;


@end
Loading

0 comments on commit ff67ead

Please sign in to comment.