Skip to content

Commit a033362

Browse files
mikehaney24mikehaney24
authored
Revert "Build GDT for Catalyst (#3525)"
This reverts commit c5afe85.
1 parent c5afe85 commit a033362

File tree

6 files changed

+27
-148
lines changed

6 files changed

+27
-148
lines changed

‎GoogleDataTransport/GDTLibrary/GDTStorage.m

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,7 @@ - (void)storeEvent:(GDTEvent *)event {
111111

112112
// If running in the background, save state to disk and end the associated background task.
113113
if (bgID != GDTBackgroundIdentifierInvalid) {
114-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
115-
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
116-
requiringSecureCoding:YES
117-
error:nil];
118-
[data writeToFile:[GDTStorage archivePath] atomically:YES];
119-
} else {
120-
#if !defined(TARGET_OS_MACCATALYST)
121-
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
122-
#endif
123-
}
114+
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
124115
[[GDTApplication sharedApplication] endBackgroundTask:bgID];
125116
}
126117
});
@@ -202,29 +193,13 @@ - (void)addEventToTrackingCollections:(GDTStoredEvent *)event {
202193
#pragma mark - GDTLifecycleProtocol
203194

204195
- (void)appWillForeground:(GDTApplication *)app {
205-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
206-
NSData *data = [NSData dataWithContentsOfFile:[GDTStorage archivePath]];
207-
[NSKeyedUnarchiver unarchivedObjectOfClass:[GDTStorage class] fromData:data error:nil];
208-
} else {
209-
#if !defined(TARGET_OS_MACCATALYST)
210-
[NSKeyedUnarchiver unarchiveObjectWithFile:[GDTStorage archivePath]];
211-
#endif
212-
}
196+
[NSKeyedUnarchiver unarchiveObjectWithFile:[GDTStorage archivePath]];
213197
self->_runningInBackground = NO;
214198
}
215199

216200
- (void)appWillBackground:(GDTApplication *)app {
217201
self->_runningInBackground = YES;
218-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
219-
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
220-
requiringSecureCoding:YES
221-
error:nil];
222-
[data writeToFile:[GDTStorage archivePath] atomically:YES];
223-
} else {
224-
#if !defined(TARGET_OS_MACCATALYST)
225-
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
226-
#endif
227-
}
202+
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
228203
// Create an immediate background task to run until the end of the current queue of work.
229204
__block GDTBackgroundIdentifier bgID = [app beginBackgroundTaskWithExpirationHandler:^{
230205
[app endBackgroundTask:bgID];
@@ -235,16 +210,7 @@ - (void)appWillBackground:(GDTApplication *)app {
235210
}
236211

237212
- (void)appWillTerminate:(GDTApplication *)application {
238-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
239-
NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
240-
requiringSecureCoding:YES
241-
error:nil];
242-
[data writeToFile:[GDTStorage archivePath] atomically:YES];
243-
} else {
244-
#if !defined(TARGET_OS_MACCATALYST)
245-
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
246-
#endif
247-
}
213+
[NSKeyedArchiver archiveRootObject:self toFile:[GDTStorage archivePath]];
248214
}
249215

250216
#pragma mark - NSSecureCoding
@@ -266,14 +232,11 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
266232
// Create the singleton and populate its ivars.
267233
GDTStorage *sharedInstance = [self.class sharedInstance];
268234
dispatch_sync(sharedInstance.storageQueue, ^{
269-
NSSet *classes =
270-
[NSSet setWithObjects:[NSMutableOrderedSet class], [GDTStoredEvent class], nil];
271-
sharedInstance->_storedEvents = [aDecoder decodeObjectOfClasses:classes
272-
forKey:kGDTStorageStoredEventsKey];
273-
classes = [NSSet setWithObjects:[NSMutableDictionary class], [NSMutableSet class],
274-
[GDTStoredEvent class], nil];
235+
sharedInstance->_storedEvents = [aDecoder decodeObjectOfClass:[NSMutableOrderedSet class]
236+
forKey:kGDTStorageStoredEventsKey];
275237
sharedInstance->_targetToEventSet =
276-
[aDecoder decodeObjectOfClasses:classes forKey:kGDTStorageTargetToEventSetKey];
238+
[aDecoder decodeObjectOfClass:[NSMutableDictionary class]
239+
forKey:kGDTStorageTargetToEventSetKey];
277240
sharedInstance->_uploadCoordinator =
278241
[aDecoder decodeObjectOfClass:[GDTUploadCoordinator class]
279242
forKey:kGDTStorageUploadCoordinatorKey];

‎GoogleDataTransport/GDTLibrary/GDTUploadPackage.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#import <GoogleDataTransport/GDTClock.h>
2020
#import <GoogleDataTransport/GDTConsoleLogger.h>
21-
#import <GoogleDataTransport/GDTStoredEvent.h>
2221

2322
#import "GDTLibrary/Private/GDTStorage_Private.h"
2423
#import "GDTLibrary/Private/GDTUploadCoordinator.h"
@@ -141,12 +140,11 @@ - (nullable instancetype)initWithCoder:(nonnull NSCoder *)aDecoder {
141140
GDTTarget target = [aDecoder decodeIntegerForKey:kTargetKey];
142141
self = [self initWithTarget:target];
143142
if (self) {
144-
NSSet *classes = [NSSet setWithObjects:[NSSet class], [GDTStoredEvent class], nil];
145-
_events = [aDecoder decodeObjectOfClasses:classes forKey:kEventsKey];
143+
_events = [aDecoder decodeObjectOfClass:[NSSet class] forKey:kEventsKey];
146144
_deliverByTime = [aDecoder decodeObjectOfClass:[GDTClock class] forKey:kDeliverByTimeKey];
147145
_isHandled = [aDecoder decodeBoolForKey:kIsHandledKey];
148-
// _handler isn't technically NSSecureCoding, because we don't know the class of this object.
149-
// but it gets decoded anyway.
146+
// Isn't technically NSSecureCoding, because we don't know the class of this object.
147+
_handler = [aDecoder decodeObjectForKey:kHandlerKey];
150148
}
151149
return self;
152150
}

‎GoogleDataTransport/GDTTests/Unit/GDTClockTest.m

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,8 @@ - (void)testSupportsSecureEncoding {
5151
/** Tests encoding and decoding a clock using a keyed archiver. */
5252
- (void)testEncoding {
5353
GDTClock *clock = [GDTClock snapshot];
54-
GDTClock *unarchivedClock;
55-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
56-
NSData *clockData = [NSKeyedArchiver archivedDataWithRootObject:clock
57-
requiringSecureCoding:YES
58-
error:nil];
59-
unarchivedClock = [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTClock class]
60-
fromData:clockData
61-
error:nil];
62-
} else {
63-
#if !defined(TARGET_OS_MACCATALYST)
64-
NSData *clockData = [NSKeyedArchiver archivedDataWithRootObject:clock];
65-
unarchivedClock = [NSKeyedUnarchiver unarchiveObjectWithData:clockData];
66-
#endif
67-
}
54+
NSData *clockData = [NSKeyedArchiver archivedDataWithRootObject:clock];
55+
GDTClock *unarchivedClock = [NSKeyedUnarchiver unarchiveObjectWithData:clockData];
6856
XCTAssertEqual([clock hash], [unarchivedClock hash]);
6957
XCTAssertEqualObjects(clock, unarchivedClock);
7058
}

‎GoogleDataTransport/GDTTests/Unit/GDTEventTest.m

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,12 @@ - (void)testArchiving {
4343
event.qosTier = GDTEventQoSTelemetry;
4444
event.clockSnapshot = clockSnapshot;
4545

46-
NSData *archiveData;
47-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
48-
archiveData = [NSKeyedArchiver archivedDataWithRootObject:event
49-
requiringSecureCoding:YES
50-
error:nil];
51-
} else {
52-
#if !defined(TARGET_OS_MACCATALYST)
53-
archiveData = [NSKeyedArchiver archivedDataWithRootObject:event];
54-
#endif
55-
}
46+
NSData *archiveData = [NSKeyedArchiver archivedDataWithRootObject:event];
47+
5648
// To ensure that all the objects being retained by the original event are dealloc'd.
5749
event = nil;
58-
GDTEvent *decodedEvent;
59-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
60-
decodedEvent = [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTEvent class]
61-
fromData:archiveData
62-
error:nil];
63-
} else {
64-
#if !defined(TARGET_OS_MACCATALYST)
65-
decodedEvent = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
66-
#endif
67-
}
50+
51+
GDTEvent *decodedEvent = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
6852
XCTAssertEqualObjects(decodedEvent.mappingID, @"testID");
6953
XCTAssertEqual(decodedEvent.target, 42);
7054
XCTAssertEqualObjects(decodedEvent.dataObjectTransportBytes,

‎GoogleDataTransport/GDTTests/Unit/GDTStorageTest.m

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ - (void)testStoreEvent {
8383
@autoreleasepool {
8484
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
8585
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
86-
event.clockSnapshot = [GDTClock snapshot];
8786
XCTAssertNoThrow([[GDTStorage sharedInstance] storeEvent:event]);
8887
}
8988
dispatch_sync([GDTStorage sharedInstance].storageQueue, ^{
@@ -104,7 +103,6 @@ - (void)testRemoveEvent {
104103
@autoreleasepool {
105104
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
106105
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
107-
event.clockSnapshot = [GDTClock snapshot];
108106
XCTAssertNoThrow([[GDTStorage sharedInstance] storeEvent:event]);
109107
}
110108
__block NSURL *eventFile;
@@ -225,7 +223,7 @@ - (void)testEventDeallocationIsEnforced {
225223
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
226224
weakEvent = event;
227225
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
228-
event.clockSnapshot = [GDTClock snapshot];
226+
229227
// Store the event and wait for the expectation.
230228
[[GDTStorage sharedInstance] storeEvent:event];
231229
GDTDataFuture *dataFuture =
@@ -258,75 +256,38 @@ - (void)testEventDeallocationIsEnforced {
258256
- (void)testNSSecureCoding {
259257
XCTAssertTrue([GDTStorage supportsSecureCoding]);
260258
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
261-
event.clockSnapshot = [GDTClock snapshot];
262259
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
263260
XCTAssertNoThrow([[GDTStorage sharedInstance] storeEvent:event]);
264261
event = nil;
265-
NSData *storageData;
266-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
267-
storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]
268-
requiringSecureCoding:YES
269-
error:nil];
270-
} else {
271-
#if !defined(TARGET_OS_MACCATALYST)
272-
storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]];
273-
#endif
274-
}
262+
NSData *storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]];
275263
dispatch_sync([GDTStorage sharedInstance].storageQueue, ^{
276264
XCTAssertNotNil([[GDTStorage sharedInstance].storedEvents lastObject]);
277265
});
278266
[[GDTStorage sharedInstance] removeEvents:[GDTStorage sharedInstance].storedEvents.set];
279267
dispatch_sync([GDTStorage sharedInstance].storageQueue, ^{
280268
XCTAssertNil([[GDTStorage sharedInstance].storedEvents lastObject]);
281269
});
282-
GDTStorage *unarchivedStorage;
283-
NSError *error;
284-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
285-
unarchivedStorage = [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTStorage class]
286-
fromData:storageData
287-
error:&error];
288-
} else {
289-
#if !defined(TARGET_OS_MACCATALYST)
290-
unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
291-
#endif
292-
}
270+
271+
GDTStorage *unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
293272
XCTAssertNotNil([unarchivedStorage.storedEvents lastObject]);
294273
}
295274

296275
/** Tests encoding and decoding the storage singleton when calling -sharedInstance. */
297276
- (void)testNSSecureCodingWithSharedInstance {
298277
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
299278
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
300-
event.clockSnapshot = [GDTClock snapshot];
301279
XCTAssertNoThrow([[GDTStorage sharedInstance] storeEvent:event]);
302280
event = nil;
303-
NSData *storageData;
304-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
305-
storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]
306-
requiringSecureCoding:YES
307-
error:nil];
308-
} else {
309-
#if !defined(TARGET_OS_MACCATALYST)
310-
storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]];
311-
#endif
312-
}
281+
NSData *storageData = [NSKeyedArchiver archivedDataWithRootObject:[GDTStorage sharedInstance]];
313282
dispatch_sync([GDTStorage sharedInstance].storageQueue, ^{
314283
XCTAssertNotNil([[GDTStorage sharedInstance].storedEvents lastObject]);
315284
});
316285
[[GDTStorage sharedInstance] removeEvents:[GDTStorage sharedInstance].storedEvents.set];
317286
dispatch_sync([GDTStorage sharedInstance].storageQueue, ^{
318287
XCTAssertNil([[GDTStorage sharedInstance].storedEvents lastObject]);
319288
});
320-
GDTStorage *unarchivedStorage;
321-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
322-
unarchivedStorage = [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTStorage class]
323-
fromData:storageData
324-
error:nil];
325-
} else {
326-
#if !defined(TARGET_OS_MACCATALYST)
327-
unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
328-
#endif
329-
}
289+
290+
GDTStorage *unarchivedStorage = [NSKeyedUnarchiver unarchiveObjectWithData:storageData];
330291
XCTAssertNotNil([unarchivedStorage.storedEvents lastObject]);
331292
}
332293

@@ -337,7 +298,6 @@ - (void)testQoSTierFast {
337298
GDTEvent *event = [[GDTEvent alloc] initWithMappingID:@"404" target:target];
338299
event.dataObjectTransportBytes = [@"testString" dataUsingEncoding:NSUTF8StringEncoding];
339300
event.qosTier = GDTEventQoSFast;
340-
event.clockSnapshot = [GDTClock snapshot];
341301
XCTAssertFalse(self.uploaderFake.forceUploadCalled);
342302
XCTAssertNoThrow([[GDTStorage sharedInstance] storeEvent:event]);
343303
}

‎GoogleDataTransport/GDTTests/Unit/GDTUploadPackageTest.m

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,23 +110,9 @@ - (void)testEncoding {
110110
NSMutableSet<GDTStoredEvent *> *set = [GDTEventGenerator generate3StoredEvents];
111111
uploadPackage.events = set;
112112
uploadPackage.handler = self;
113-
GDTUploadPackage *recreatedPackage;
114-
NSError *error;
115-
116-
if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
117-
NSData *packageData = [NSKeyedArchiver archivedDataWithRootObject:uploadPackage
118-
requiringSecureCoding:YES
119-
error:&error];
120-
recreatedPackage = [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTUploadPackage class]
121-
fromData:packageData
122-
error:&error];
123-
XCTAssertNil(error);
124-
} else {
125-
#if !defined(TARGET_OS_MACCATALYST)
126-
NSData *packageData = [NSKeyedArchiver archivedDataWithRootObject:uploadPackage];
127-
recreatedPackage = [NSKeyedUnarchiver unarchiveObjectWithData:packageData];
128-
#endif
129-
}
113+
114+
NSData *packageData = [NSKeyedArchiver archivedDataWithRootObject:uploadPackage];
115+
GDTUploadPackage *recreatedPackage = [NSKeyedUnarchiver unarchiveObjectWithData:packageData];
130116
XCTAssertEqualObjects(uploadPackage, recreatedPackage);
131117
}
132118

0 commit comments

Comments
 (0)