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

Commit 05ff8eb

Browse files
Merge pull request #516 from zendesk/aloconnor/3.0.2
Release of Zendesk SDK 3.0.2 built with swift 5.1
2 parents 8b832a9 + d5e7565 commit 05ff8eb

File tree

373 files changed

+283
-27
lines changed

Some content is hidden

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

373 files changed

+283
-27
lines changed

ZendeskSDK.podspec

+11-11
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 = "3.0.1"
4-
s.summary = "Zendesk SDK 3.0.1"
3+
s.version = "3.0.2"
4+
s.summary = "Zendesk SDK 3.0.2"
55
s.homepage = "https://github.com/zendesk/zendesk_sdk_ios"
66
s.license = {
77
:type => 'Copyright',
@@ -20,32 +20,32 @@ Pod::Spec.new do |s|
2020
s.platform = :ios, '9.3'
2121
s.requires_arc = true
2222
s.frameworks = 'MobileCoreServices', 'SystemConfiguration', 'Security', 'MessageUI'
23-
s.swift_version = '5.0.1'
23+
s.swift_version = '5.1'
2424
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited)', 'CLANG_ENABLE_MODULES' => 'YES', 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES' }
25-
25+
2626

2727
# Using subspecs to support installation without Localization part
2828
s.default_subspecs = 'UI', 'Providers'
2929

3030
s.subspec 'UI' do |ss|
3131
ss.platform = :ios, '9.3'
32-
ss.ios.vendored_frameworks = "ZendeskSDK/5.0.1/ZendeskSDK.framework", "ZendeskSDK/5.0.1/CommonUISDK.framework"
33-
ss.preserve_paths = "ZendeskSDK/5.0.1/*.framework"
32+
ss.ios.vendored_frameworks = "ZendeskSDK/5.1/ZendeskSDK.framework", "ZendeskSDK/5.1/CommonUISDK.framework"
33+
ss.preserve_paths = "ZendeskSDK/5.1/*.framework"
3434
ss.dependency 'ZendeskSDK/Providers'
3535
ss.dependency 'ZendeskSDK/Core'
3636
end
3737

3838
s.subspec 'Providers' do |ss|
3939
ss.platform = :ios, '9.3'
40-
ss.ios.vendored_frameworks = "ZendeskSDK/5.0.1/ZendeskProviderSDK.framework"
41-
ss.preserve_paths = "ZendeskSDK/5.0.1/ZendeskProviderSDK.framework"
40+
ss.ios.vendored_frameworks = "ZendeskSDK/5.1/ZendeskProviderSDK.framework"
41+
ss.preserve_paths = "ZendeskSDK/5.1/ZendeskProviderSDK.framework"
4242
ss.dependency 'ZendeskSDK/Core'
4343
end
4444

4545
s.subspec 'Core' do |ss|
4646
ss.platform = :ios, '9.3'
47-
ss.ios.vendored_frameworks = "ZendeskSDK/5.0.1/ZendeskCoreSDK.framework"
48-
ss.preserve_paths = "ZendeskSDK/5.0.1/ZendeskCoreSDK.framework"
49-
end
47+
ss.ios.vendored_frameworks = "ZendeskSDK/5.1/ZendeskCoreSDK.framework"
48+
ss.preserve_paths = "ZendeskSDK/5.1/ZendeskCoreSDK.framework"
49+
end
5050

5151
end
Binary file not shown.
Binary file not shown.
-434 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-844 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ZendeskSDK/5.0.1/CommonUISDK.framework/Headers/CommonUISDK-Swift.h renamed to ZendeskSDK/5.1/CommonUISDK.framework/Headers/CommonUISDK-Swift.h

+64-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if 0
55
#elif defined(__x86_64__) && __x86_64__
6-
// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)
6+
// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
77
#pragma clang diagnostic push
88
#pragma clang diagnostic ignored "-Wgcc-compat"
99

@@ -115,6 +115,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
115115
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
116116
# endif
117117
#endif
118+
#if !defined(SWIFT_RESILIENT_CLASS)
119+
# if __has_attribute(objc_class_stub)
120+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
121+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
122+
# else
123+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
124+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
125+
# endif
126+
#endif
118127

119128
#if !defined(SWIFT_PROTOCOL)
120129
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
@@ -156,6 +165,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
156165
#if !defined(SWIFT_AVAILABILITY)
157166
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
158167
#endif
168+
#if !defined(SWIFT_WEAK_IMPORT)
169+
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
170+
#endif
159171
#if !defined(SWIFT_DEPRECATED)
160172
# define SWIFT_DEPRECATED __attribute__((deprecated))
161173
#endif
@@ -167,6 +179,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
167179
#else
168180
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
169181
#endif
182+
#if !defined(IBSegueAction)
183+
# define IBSegueAction
184+
#endif
170185
#if __has_feature(modules)
171186
#if __has_warning("-Watimport-in-framework-header")
172187
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
@@ -332,7 +347,7 @@ SWIFT_PROTOCOL_NAMED("UiConfiguration")
332347
#pragma clang diagnostic pop
333348

334349
#elif defined(__i386__) && __i386__
335-
// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)
350+
// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
336351
#pragma clang diagnostic push
337352
#pragma clang diagnostic ignored "-Wgcc-compat"
338353

@@ -444,6 +459,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
444459
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
445460
# endif
446461
#endif
462+
#if !defined(SWIFT_RESILIENT_CLASS)
463+
# if __has_attribute(objc_class_stub)
464+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
465+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
466+
# else
467+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
468+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
469+
# endif
470+
#endif
447471

448472
#if !defined(SWIFT_PROTOCOL)
449473
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
@@ -485,6 +509,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
485509
#if !defined(SWIFT_AVAILABILITY)
486510
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
487511
#endif
512+
#if !defined(SWIFT_WEAK_IMPORT)
513+
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
514+
#endif
488515
#if !defined(SWIFT_DEPRECATED)
489516
# define SWIFT_DEPRECATED __attribute__((deprecated))
490517
#endif
@@ -496,6 +523,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
496523
#else
497524
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
498525
#endif
526+
#if !defined(IBSegueAction)
527+
# define IBSegueAction
528+
#endif
499529
#if __has_feature(modules)
500530
#if __has_warning("-Watimport-in-framework-header")
501531
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
@@ -665,7 +695,7 @@ SWIFT_PROTOCOL_NAMED("UiConfiguration")
665695

666696
#if 0
667697
#elif defined(__arm64__) && __arm64__
668-
// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)
698+
// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
669699
#pragma clang diagnostic push
670700
#pragma clang diagnostic ignored "-Wgcc-compat"
671701

@@ -777,6 +807,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
777807
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
778808
# endif
779809
#endif
810+
#if !defined(SWIFT_RESILIENT_CLASS)
811+
# if __has_attribute(objc_class_stub)
812+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
813+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
814+
# else
815+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
816+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
817+
# endif
818+
#endif
780819

781820
#if !defined(SWIFT_PROTOCOL)
782821
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
@@ -818,6 +857,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
818857
#if !defined(SWIFT_AVAILABILITY)
819858
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
820859
#endif
860+
#if !defined(SWIFT_WEAK_IMPORT)
861+
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
862+
#endif
821863
#if !defined(SWIFT_DEPRECATED)
822864
# define SWIFT_DEPRECATED __attribute__((deprecated))
823865
#endif
@@ -829,6 +871,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
829871
#else
830872
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
831873
#endif
874+
#if !defined(IBSegueAction)
875+
# define IBSegueAction
876+
#endif
832877
#if __has_feature(modules)
833878
#if __has_warning("-Watimport-in-framework-header")
834879
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
@@ -994,7 +1039,7 @@ SWIFT_PROTOCOL_NAMED("UiConfiguration")
9941039
#pragma clang diagnostic pop
9951040

9961041
#elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__
997-
// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)
1042+
// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)
9981043
#pragma clang diagnostic push
9991044
#pragma clang diagnostic ignored "-Wgcc-compat"
10001045

@@ -1106,6 +1151,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
11061151
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
11071152
# endif
11081153
#endif
1154+
#if !defined(SWIFT_RESILIENT_CLASS)
1155+
# if __has_attribute(objc_class_stub)
1156+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
1157+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
1158+
# else
1159+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
1160+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
1161+
# endif
1162+
#endif
11091163

11101164
#if !defined(SWIFT_PROTOCOL)
11111165
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
@@ -1147,6 +1201,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
11471201
#if !defined(SWIFT_AVAILABILITY)
11481202
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
11491203
#endif
1204+
#if !defined(SWIFT_WEAK_IMPORT)
1205+
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
1206+
#endif
11501207
#if !defined(SWIFT_DEPRECATED)
11511208
# define SWIFT_DEPRECATED __attribute__((deprecated))
11521209
#endif
@@ -1158,6 +1215,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
11581215
#else
11591216
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
11601217
#endif
1218+
#if !defined(IBSegueAction)
1219+
# define IBSegueAction
1220+
#endif
11611221
#if __has_feature(modules)
11621222
#if __has_warning("-Watimport-in-framework-header")
11631223
#pragma clang diagnostic ignored "-Watimport-in-framework-header"

0 commit comments

Comments
 (0)