@@ -127,8 +127,7 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
127
127
if (networkCurrentRadioAccessTechnologyDict.count ) {
128
128
networkCurrentRadioAccessTechnology = networkCurrentRadioAccessTechnologyDict.allValues [0 ];
129
129
}
130
- #else // TARGET_OS_MACCATALYST
131
- #if defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000
130
+ #else // TARGET_OS_MACCATALYST
132
131
if (@available (iOS 12.0 , *)) {
133
132
NSDictionary <NSString *, NSString *> *networkCurrentRadioAccessTechnologyDict =
134
133
networkInfo.serviceCurrentRadioAccessTechnology ;
@@ -138,9 +137,7 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
138
137
networkCurrentRadioAccessTechnology = networkCurrentRadioAccessTechnologyDict.allValues [0 ];
139
138
}
140
139
} else {
141
- #else // defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000
142
- networkCurrentRadioAccessTechnology = networkInfo.currentRadioAccessTechnology ;
143
- #endif // // defined(__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000
140
+ networkCurrentRadioAccessTechnology = networkInfo.currentRadioAccessTechnology ;
144
141
}
145
142
#endif // TARGET_OS_MACCATALYST
146
143
if (networkCurrentRadioAccessTechnology) {
@@ -194,11 +191,6 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
194
191
}
195
192
}
196
193
NSData *resultData;
197
- #if (defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || \
198
- (defined (__MAC_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 ) || \
199
- (defined (__TVOS_11_0) && __TV_OS_VERSION_MAX_ALLOWED >= 110000 ) || \
200
- (defined (__WATCHOS_4_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= 040000 ) || \
201
- (defined (TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST)
202
194
if (@available (macOS 10.13 , iOS 11.0 , tvOS 11.0 , watchOS 4 , *)) {
203
195
resultData = [NSKeyedArchiver archivedDataWithRootObject: obj
204
196
requiringSecureCoding: YES
@@ -216,7 +208,6 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
216
208
}
217
209
}
218
210
} else {
219
- #endif
220
211
@try {
221
212
#pragma clang diagnostic push
222
213
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -248,11 +239,6 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
248
239
NSData *_Nullable archiveData,
249
240
NSError *_Nullable *error) {
250
241
id <NSSecureCoding > unarchivedObject = nil ;
251
- #if (defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || \
252
- (defined (__MAC_10_13) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 ) || \
253
- (defined (__TVOS_11_0) && __TV_OS_VERSION_MAX_ALLOWED >= 110000 ) || \
254
- (defined (__WATCHOS_4_0) && __WATCH_OS_VERSION_MAX_ALLOWED >= 040000 ) || \
255
- (defined (TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST)
256
242
if (@available (macOS 10.13 , iOS 11.0 , tvOS 11.0 , watchOS 4 , *)) {
257
243
NSData *data = archiveData ? archiveData : [NSData dataWithContentsOfFile: archivePath];
258
244
if (data) {
@@ -261,7 +247,6 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
261
247
error: error];
262
248
}
263
249
} else {
264
- #endif
265
250
@try {
266
251
NSData *archivedData =
267
252
archiveData ? archiveData : [NSData dataWithContentsOfFile: archivePath];
0 commit comments