Add Xcode 10 travis testing (#1932)

Author: paulb777

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode9.4
+osx_image: xcode10
 language: objective-c
 cache:
   - bundler
@@ -33,8 +33,6 @@ jobs:
       env:
         - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
       before_install:
-        - npm install ios-sim -g
-        - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus, 11.3"
         - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
       script:
         - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
@@ -116,6 +114,36 @@ jobs:
 
     # Alternative platforms
 
+    # Xcode 9
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - npm install ios-sim -g
+        - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus, 11.3"
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
+
     - stage: test
       env:
         - PROJECT=Firestore PLATFORM=macOS METHOD=cmake

scripts/build.sh

@@ -231,25 +231,41 @@ case "$product-$method-$platform" in
     ;;
 
   InAppMessagingDisplay-xcodebuild-iOS)
-    # Run UI tests on both iPad and iphone simultors
+    # Run UI tests on both iPad and iPhone simulators
+    # TODO: Running two destinations from one xcodebuild command stopped working with Xcode 10.
+    # Consider separating static library tests to a separate job.
     RunXcodebuild \
         -workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace'  \
         -scheme 'FiamDisplaySwiftExample' \
         "${xcb_flags[@]}" \
-        -destination 'platform=iOS Simulator,name=iPad Air' \
+        build \
+        test
+
+      RunXcodebuild \
+        -workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace'  \
+        -scheme 'FiamDisplaySwiftExample' \
+        -sdk 'iphonesimulator' \
+        -destination 'platform=iOS Simulator,name=iPad Pro (9.7-inch)' \
         build \
         test
 
     cd InAppMessagingDisplay/Example
     sed -i -e 's/use_frameworks/\#use_frameworks/' Podfile
     pod update --no-repo-update
     cd ../..
-    # Run UI tests on both iPad and iphone simultors
+    # Run UI tests on both iPad and iPhone simulators
     RunXcodebuild \
         -workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace'  \
         -scheme 'FiamDisplaySwiftExample' \
         "${xcb_flags[@]}" \
-        -destination 'platform=iOS Simulator,name=iPad Air' \
+        build \
+        test
+
+      RunXcodebuild \
+        -workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace'  \
+        -scheme 'FiamDisplaySwiftExample' \
+        -sdk 'iphonesimulator' \
+        -destination 'platform=iOS Simulator,name=iPad Pro (9.7-inch)' \
         build \
         test
     ;;

scripts/style.sh

@@ -61,7 +61,7 @@ if [[ "$system" == "Darwin" ]]; then
   version="${version/*version /}"
   # Allow an older swiftformat because travis isn't running High Sierra yet
   # and the formula hasn't been updated in a while on Sierra :-/.
-  if [[ "$version" != "0.32.0" && "$version" != "0.33"* ]]; then
+  if [[ "$version" != "0.32.0" && "$version" != "0.33"* && "$version" != "0.35"* ]]; then
     echo "Version $version installed. Please upgrade to at least swiftformat 0.33.8"
     echo "If it's installed via homebrew you can run: brew upgrade swiftformat"
     exit 1