Travis to Xcode 11.0 (#3944)

Author: paulb777

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10.3
+osx_image: xcode11
 language: objective-c
 cache:
   - bundler
@@ -256,6 +256,7 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseFunctions.podspec --use-modular-headers
 
     - stage: test
+      osx_image: xcode10.3
       env:
         - PROJECT=InAppMessaging PLATFORM=iOS METHOD=xcodebuild
       before_install:
@@ -328,6 +329,7 @@ jobs:
         - travis_wait 45 ./scripts/pod_lib_lint.rb FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs
 
     - stage: test
+      osx_image: xcode10.3
       env:
         - PROJECT=GoogleDataTransport METHOD=pod-lib-lint
       script:

Example/Database/Tests/Unit/FLevelDBStorageEngineTests.m

@@ -473,7 +473,7 @@ - (void)testHugeLeafNodeThenDeeperSet {
 // It is kind of bad we raise "invalid" data, but at least we don't crash *trollface*
 - (void)testExtremeDoublesAsServerCache {
 #ifdef TARGET_OS_IOS
-  if ([[NSProcessInfo processInfo] operatingSystemVersion].majorVersion == 11) {
+  if ([[NSProcessInfo processInfo] operatingSystemVersion].majorVersion >= 11) {
     // NSJSONSerialization on iOS 11 correctly serializes small and large doubles.
     return;
   }
@@ -532,8 +532,14 @@ - (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
+#ifdef TARGET_OS_IOS
+  // Catalyst and iOS 13 use int128_t but CFNumber still calls it 64 bits.
+  if ([[NSProcessInfo processInfo] operatingSystemVersion].majorVersion >= 13) {
+    XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberSInt64Type);
+  } else {
+    XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberFloat64Type);
+  }
+#elif TARGET_OS_MACCATALYST
   XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberSInt64Type);
 #else
   XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberFloat64Type);

scripts/build.sh

@@ -91,10 +91,22 @@ function RunXcodebuild() {
   fi
 }
 
-ios_flags=(
-  -sdk 'iphonesimulator'
-  -destination 'platform=iOS Simulator,name=iPhone 7'
-)
+# Remove each product when it moves up to Xcode 11
+if [[ $product == 'Firestore' || # #3949
+      $product == 'GoogleDataTransport' || # #3947
+      $product == 'InAppMessaging' # #3948
+   ]]; then
+  ios_flags=(
+    -sdk 'iphonesimulator'
+    -destination 'platform=iOS Simulator,name=iPhone 7'
+  )
+else
+  ios_flags=(
+    -sdk 'iphonesimulator'
+    -destination 'platform=iOS Simulator,name=iPhone 11'
+  )
+fi
+
 macos_flags=(
   -sdk 'macosx'
   -destination 'platform=OS X,arch=x86_64'
@@ -201,18 +213,6 @@ case "$product-$method-$platform" in
     if [[ $platform == 'iOS' ]]; then
       # Code Coverage collection is only working on iOS currently.
       ./scripts/collect_metrics.sh 'Example/Firebase.xcworkspace' "AllUnitTests_$platform"
-
-      # Test iOS Objective-C static library build
-      cd Example
-      sed -i -e 's/use_frameworks/\#use_frameworks/' Podfile
-      pod update --no-repo-update
-      cd ..
-      RunXcodebuild \
-          -workspace 'Example/Firebase.xcworkspace' \
-          -scheme "AllUnitTests_$platform" \
-          "${xcb_flags[@]}" \
-          build \
-          test
     fi
     ;;