Skip to content

Commit 9562d4a

Browse files
author
Edward Smith
committed
Updated OHHTTPStubs for new Swift version.
1 parent 9dd354b commit 9562d4a

File tree

12 files changed

+95
-46
lines changed

12 files changed

+95
-46
lines changed
Binary file not shown.

Branch-SDK-Tests/Vendor/OHHTTPStubs.framework/Headers/OHHTTPStubs-Swift.h

Lines changed: 62 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
1+
// Generated by Apple Swift version 4.1 effective-3.3 (swiftlang-902.0.48 clang-902.0.37.1)
22
#pragma clang diagnostic push
3+
#pragma clang diagnostic ignored "-Wgcc-compat"
34

4-
#if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
5+
#if !defined(__has_include)
6+
# define __has_include(x) 0
7+
#endif
8+
#if !defined(__has_attribute)
9+
# define __has_attribute(x) 0
10+
#endif
11+
#if !defined(__has_feature)
12+
# define __has_feature(x) 0
13+
#endif
14+
#if !defined(__has_warning)
15+
# define __has_warning(x) 0
16+
#endif
17+
18+
#if __has_include(<swift/objc-prologue.h>)
519
# include <swift/objc-prologue.h>
620
#endif
721

@@ -13,9 +27,9 @@
1327

1428
#if !defined(SWIFT_TYPEDEFS)
1529
# define SWIFT_TYPEDEFS 1
16-
# if defined(__has_include) && __has_include(<uchar.h>)
30+
# if __has_include(<uchar.h>)
1731
# include <uchar.h>
18-
# elif !defined(__cplusplus) || __cplusplus < 201103L
32+
# elif !defined(__cplusplus)
1933
typedef uint_least16_t char16_t;
2034
typedef uint_least32_t char32_t;
2135
# endif
@@ -48,31 +62,36 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
4862
# endif
4963
#endif
5064

51-
#if defined(__has_attribute) && __has_attribute(objc_runtime_name)
65+
#if __has_attribute(objc_runtime_name)
5266
# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
5367
#else
5468
# define SWIFT_RUNTIME_NAME(X)
5569
#endif
56-
#if defined(__has_attribute) && __has_attribute(swift_name)
70+
#if __has_attribute(swift_name)
5771
# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
5872
#else
5973
# define SWIFT_COMPILE_NAME(X)
6074
#endif
61-
#if defined(__has_attribute) && __has_attribute(objc_method_family)
75+
#if __has_attribute(objc_method_family)
6276
# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
6377
#else
6478
# define SWIFT_METHOD_FAMILY(X)
6579
#endif
66-
#if defined(__has_attribute) && __has_attribute(noescape)
80+
#if __has_attribute(noescape)
6781
# define SWIFT_NOESCAPE __attribute__((noescape))
6882
#else
6983
# define SWIFT_NOESCAPE
7084
#endif
71-
#if defined(__has_attribute) && __has_attribute(warn_unused_result)
85+
#if __has_attribute(warn_unused_result)
7286
# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
7387
#else
7488
# define SWIFT_WARN_UNUSED_RESULT
7589
#endif
90+
#if __has_attribute(noreturn)
91+
# define SWIFT_NORETURN __attribute__((noreturn))
92+
#else
93+
# define SWIFT_NORETURN
94+
#endif
7695
#if !defined(SWIFT_CLASS_EXTRA)
7796
# define SWIFT_CLASS_EXTRA
7897
#endif
@@ -83,7 +102,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
83102
# define SWIFT_ENUM_EXTRA
84103
#endif
85104
#if !defined(SWIFT_CLASS)
86-
# if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted)
105+
# if __has_attribute(objc_subclassing_restricted)
87106
# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
88107
# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
89108
# else
@@ -102,16 +121,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
102121
#endif
103122

104123
#if !defined(OBJC_DESIGNATED_INITIALIZER)
105-
# if defined(__has_attribute) && __has_attribute(objc_designated_initializer)
124+
# if __has_attribute(objc_designated_initializer)
106125
# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
107126
# else
108127
# define OBJC_DESIGNATED_INITIALIZER
109128
# endif
110129
#endif
130+
#if !defined(SWIFT_ENUM_ATTR)
131+
# if defined(__has_attribute) && __has_attribute(enum_extensibility)
132+
# define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open)))
133+
# else
134+
# define SWIFT_ENUM_ATTR
135+
# endif
136+
#endif
111137
#if !defined(SWIFT_ENUM)
112-
# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type
113-
# if defined(__has_feature) && __has_feature(generalized_swift_name)
114-
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_EXTRA _name : _type
138+
# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type
139+
# if __has_feature(generalized_swift_name)
140+
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type
115141
# else
116142
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name)
117143
# endif
@@ -131,9 +157,30 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
131157
#if !defined(SWIFT_DEPRECATED_MSG)
132158
# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
133159
#endif
134-
#if defined(__has_feature) && __has_feature(modules)
160+
#if __has_feature(attribute_diagnose_if_objc)
161+
# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
162+
#else
163+
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
164+
#endif
165+
#if __has_feature(modules)
135166
#endif
136167

137168
#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
138169
#pragma clang diagnostic ignored "-Wduplicate-method-arg"
170+
#if __has_warning("-Wpragma-clang-attribute")
171+
# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
172+
#endif
173+
#pragma clang diagnostic ignored "-Wunknown-pragmas"
174+
#pragma clang diagnostic ignored "-Wnullability"
175+
176+
#if __has_attribute(external_source_symbol)
177+
# pragma push_macro("any")
178+
# undef any
179+
# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="OHHTTPStubs",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
180+
# pragma pop_macro("any")
181+
#endif
182+
183+
#if __has_attribute(external_source_symbol)
184+
# pragma clang attribute pop
185+
#endif
139186
#pragma clang diagnostic pop
-17 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Branch-SDK-Tests/Vendor/OHHTTPStubs.framework/Modules/module.modulemap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ framework module OHHTTPStubs {
77

88
module OHHTTPStubs.Swift {
99
header "OHHTTPStubs-Swift.h"
10+
requires objc
1011
}
-884 Bytes
Binary file not shown.

Branch-SDK-Tests/Vendor/OHHTTPStubs.framework/_CodeSignature/CodeResources

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</data>
1919
<key>Headers/OHHTTPStubs-Swift.h</key>
2020
<data>
21-
YjOFRc0CuVQCBOwKMIfA02UQ3n4=
21+
VefjKXqrMy1vlIZDB1zCw0iM/S8=
2222
</data>
2323
<key>Headers/OHHTTPStubs.h</key>
2424
<data>
@@ -46,27 +46,27 @@
4646
</data>
4747
<key>Info.plist</key>
4848
<data>
49-
aua5cBpccQPSxokDzEAOniLCR6w=
49+
bNaC1ko4PbxHQ+eCP+wIpHD8ZAE=
5050
</data>
5151
<key>Modules/OHHTTPStubs.swiftmodule/i386.swiftdoc</key>
5252
<data>
53-
ZHR07NV14NVSFkHOwnc9uTf1NXY=
53+
CC+t6iwSMqRrbhmddLRYHmCIpvE=
5454
</data>
5555
<key>Modules/OHHTTPStubs.swiftmodule/i386.swiftmodule</key>
5656
<data>
57-
x1j2S7EJXss1D+cbcbuRm6zW6Cw=
57+
5eWP4sTqSY7D69S3aC54NCPEoSc=
5858
</data>
5959
<key>Modules/OHHTTPStubs.swiftmodule/x86_64.swiftdoc</key>
6060
<data>
61-
q6yEI87aZ8V16SednB9mMzK888g=
61+
JHaP1TWa3h820bBpuN1EtqYLSLc=
6262
</data>
6363
<key>Modules/OHHTTPStubs.swiftmodule/x86_64.swiftmodule</key>
6464
<data>
65-
k2maocd4n0oEln0QgYzXBHoxWzw=
65+
YkOu1cCKx1Pa/yIE2fXdTKI4rYk=
6666
</data>
6767
<key>Modules/module.modulemap</key>
6868
<data>
69-
k8VNvarfrqeHppQF+R0Z46r6bqE=
69+
Qf6JiIASJNyHs4CmPt0Q0sdMOqA=
7070
</data>
7171
</dict>
7272
<key>files2</key>
@@ -108,11 +108,11 @@
108108
<dict>
109109
<key>hash</key>
110110
<data>
111-
YjOFRc0CuVQCBOwKMIfA02UQ3n4=
111+
VefjKXqrMy1vlIZDB1zCw0iM/S8=
112112
</data>
113113
<key>hash2</key>
114114
<data>
115-
um2DblenFuzq69SSzT/tG1yzjMpBU+qr32AXFsvSyDU=
115+
lSK2tOQgwlmN0UGUWYDb7woVBjSSZ5UNRf34Sp67yGQ=
116116
</data>
117117
</dict>
118118
<key>Headers/OHHTTPStubs.h</key>
@@ -185,55 +185,55 @@
185185
<dict>
186186
<key>hash</key>
187187
<data>
188-
ZHR07NV14NVSFkHOwnc9uTf1NXY=
188+
CC+t6iwSMqRrbhmddLRYHmCIpvE=
189189
</data>
190190
<key>hash2</key>
191191
<data>
192-
i38LoeAqHE4yuqOccuIkbu+1+JY5YDKgICgN5Fjf8Q8=
192+
yYwKoWn9xGTt8njlDG8ljeIC2DLcFfCHm5LtGqFg5QA=
193193
</data>
194194
</dict>
195195
<key>Modules/OHHTTPStubs.swiftmodule/i386.swiftmodule</key>
196196
<dict>
197197
<key>hash</key>
198198
<data>
199-
x1j2S7EJXss1D+cbcbuRm6zW6Cw=
199+
5eWP4sTqSY7D69S3aC54NCPEoSc=
200200
</data>
201201
<key>hash2</key>
202202
<data>
203-
3v7oRf04jBHHtjRZeQl2gPLond+pDc3s28JqxA7ouPA=
203+
apA3HVYKysSpZJYI+dhVPOFU4oonhtFzxI/DO/BVELw=
204204
</data>
205205
</dict>
206206
<key>Modules/OHHTTPStubs.swiftmodule/x86_64.swiftdoc</key>
207207
<dict>
208208
<key>hash</key>
209209
<data>
210-
q6yEI87aZ8V16SednB9mMzK888g=
210+
JHaP1TWa3h820bBpuN1EtqYLSLc=
211211
</data>
212212
<key>hash2</key>
213213
<data>
214-
u+903TR9ddu2dtvIwWHlJwBdNpu0uHzkrj0Ieg8hfYk=
214+
eDHhvR1lAm+BFyEoUtutRNBJG61iYEq5hjP+p8bjuGE=
215215
</data>
216216
</dict>
217217
<key>Modules/OHHTTPStubs.swiftmodule/x86_64.swiftmodule</key>
218218
<dict>
219219
<key>hash</key>
220220
<data>
221-
k2maocd4n0oEln0QgYzXBHoxWzw=
221+
YkOu1cCKx1Pa/yIE2fXdTKI4rYk=
222222
</data>
223223
<key>hash2</key>
224224
<data>
225-
Y9KnHQ6JBd8TNqaUqe2N3yPny5rXJOO7MErMy09kkaY=
225+
eQtBO8m5VQLoFVyn8jFW9hImtFaB1t9nzaDhvIpr//s=
226226
</data>
227227
</dict>
228228
<key>Modules/module.modulemap</key>
229229
<dict>
230230
<key>hash</key>
231231
<data>
232-
k8VNvarfrqeHppQF+R0Z46r6bqE=
232+
Qf6JiIASJNyHs4CmPt0Q0sdMOqA=
233233
</data>
234234
<key>hash2</key>
235235
<data>
236-
27duDWEuoTqjEdHtxBmBQfJs8A9IaAg8veiYQdDs6AY=
236+
kQzDPXwoVsgHIhj+oJ7S/qnHqhmhRLQ/mFNoyny1cy0=
237237
</data>
238238
</dict>
239239
</dict>

0 commit comments

Comments
 (0)