Upgrade to XCode 11.2

Use Xcode 11.2.1 GM
wordpress-mobile · Nov 25, 2019 · 089dd75 · 089dd75
1 parent 5ed403f
commit 089dd75
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,13 +6,19 @@ orbs:
   git: wordpress-mobile/git@1.0
 
 commands:
-  load-chruby:
+  fix-path:
     steps:
       - run:
-          name: Load chruby
+          name: Fix $PATH
           command: |
-            # Force chruby to load to work around CircleCI Xcode 11 image issue
-            echo 'source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby 2.5.5' >> $BASH_ENV
+            # Add `/usr/local/bin` to the Xcode 11.2 image's $PATH in order to be able to use dependencies
+
+            if [ $(echo $PATH | ruby -e "puts Kernel.gets.include?('/usr/local/bin')") != "true" ]; then
+              echo 'export PATH=/usr/local/bin:$PATH' >> $BASH_ENV
+              echo "Manually added `/usr/local/bin` to the $PATH:"
+              echo $PATH
+            fi
+
   save-xcresult:
     steps:
       - run:
@@ -30,10 +36,9 @@ jobs:
   Build Tests:
     executor:
       name: ios/default
-      xcode-version: "11.0.0"
+      xcode-version: "11.2.1"
     steps:
       - git/shallow-checkout
-      - load-chruby
       - ios/install-dependencies:
             bundle-install: true
             pod-install: true
@@ -48,17 +53,18 @@ jobs:
   Unit Tests:
     executor:
       name: ios/default
-      xcode-version: "11.0.0"
+      xcode-version: "11.2.1"
     steps:
+      - fix-path
       - ios/boot-simulator:
-          xcode-version: "11.0.0"
+          xcode-version: "11.2.1"
           device: iPhone 11
       - attach_workspace:
           at: ./
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUnitTests_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
+          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUnitTests_iphonesimulator13.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
       - ios/save-xcodebuild-artifacts
       - save-xcresult
   UI Tests:
@@ -67,10 +73,11 @@ jobs:
         type: string
     executor:
       name: ios/default
-      xcode-version: "11.0.0"
+      xcode-version: "11.2.1"
     steps:
+      - fix-path
       - ios/boot-simulator:
-          xcode-version: "11.0.0"
+          xcode-version: "11.2.1"
           device: << parameters.device >>
       - attach_workspace:
           at: ./
@@ -81,16 +88,15 @@ jobs:
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUITests_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
+          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUITests_iphonesimulator13.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
       - ios/save-xcodebuild-artifacts
       - save-xcresult
   Installable Build:
     executor:
       name: ios/default
-      xcode-version: "11.0.0"
+      xcode-version: "11.2.1"
     steps:
       - git/shallow-checkout
-      - load-chruby
       - ios/install-dependencies:
             bundle-install: true
             pod-install: true

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.5
+2.6.4