Update Database for Catalyst (#3512)

paulb777 · web-flow · commit 3b1ebfdc706d · 2019-08-07T06:55:51.000-07:00
diff --git a/Example/Database/Tests/Unit/FLevelDBStorageEngineTests.m b/Example/Database/Tests/Unit/FLevelDBStorageEngineTests.m
@@ -478,6 +478,9 @@ - (void)testExtremeDoublesAsServerCache {
     return;
   }
 #endif
+#if TARGET_OS_MACCATALYST
+  return;
+#endif
 
   FLevelDBStorageEngine *engine = [self cleanStorageEngine];
   [engine updateServerCache:NODE((@{@"works" : @"value", @"fails" : @(2.225073858507201e-308)}))
@@ -529,7 +532,12 @@ - (void)testIntegersAreReturnedsAsIntegers {
   XCTAssertEqual(CFNumberGetType((CFNumberRef)actualInt), kCFNumberSInt64Type);
   XCTAssertEqualObjects([actualLong stringValue], [longValue stringValue]);
   XCTAssertEqual(CFNumberGetType((CFNumberRef)actualLong), kCFNumberSInt64Type);
+#if TARGET_OS_MACCATALYST
+  // Catalyst uses int128_t but CFNumber still calls it 64 bits
+  XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberSInt64Type);
+#else
   XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberFloat64Type);
+#endif
 }
 
 // TODO[offline]: Somehow test estimated server size?
diff --git a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m
@@ -18,7 +18,7 @@
 
 #import "FSRWebSocket.h"
 
-#if TARGET_OS_IOS || TARGET_OS_TV
+#if __has_include(<unicode/utf8.h>)
 #define HAS_ICU
 #endif
 
@@ -28,9 +28,9 @@
 #import <unicode/utf8.h>
 #endif
 
-#if TARGET_OS_IOS || TARGET_OS_TV
+#if __has_include(<Endian.h>)
 #import <Endian.h>
-#elif TARGET_OS_OSX
+#else
 #import <CoreServices/CoreServices.h>
 #endif
 
