From ef4c6e2c7ae44ca3eea35425f818d74b6d5484d8 Mon Sep 17 00:00:00 2001
From: Travis Long <tlong@mozilla.com>
Date: Mon, 4 May 2020 13:20:38 -0500
Subject: [PATCH] Bug 1635205 - Update CI to use Xcode 11.4.1

---
 .circleci/config.yml | 12 ++++++------
 CHANGELOG.md         |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b71695b70..c4efdc080f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -524,7 +524,7 @@ jobs:
 
   Check Swift formatting:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - checkout
       - run:
@@ -544,7 +544,7 @@ jobs:
 
   iOS build and test:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - checkout
       - run:
@@ -656,7 +656,7 @@ jobs:
 
   iOS integration test:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - checkout
       - skip-if-doc-only
@@ -707,7 +707,7 @@ jobs:
 
   Carthage release:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - checkout
       - attach_workspace:
@@ -720,7 +720,7 @@ jobs:
 
   macOS release build:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - install-rustup
       - setup-rust-toolchain
@@ -897,7 +897,7 @@ jobs:
 
   pypi-macos-release:
     macos:
-      xcode: "11.4.0"
+      xcode: "11.4.1"
     steps:
       - install-rustup
       - setup-rust-toolchain
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1242a20b..9bb64cec5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
   * BUGFIX: Fixed a race condition in the `atexit` handler, that would have resulted in the message "No database found".  See [bug 1634310](https://bugzilla.mozilla.org/show_bug.cgi?id=1634310).
   * The minimum versions of many secondary dependencies have been lowered to make the Glean SDK compatible with more environments.
   * Dependencies that depend on the version of Python being used are now specified using the `Declaring platform specific dependencies syntax in setuptools <https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-platform-specific-dependencies>`__. This means that more recent versions of dependencies are likely to be installed on Python 3.6 and later, and unnecessary backport libraries won't be installed on more recent Python versions.
+* iOS:
+  * Glean for iOS is now being built with Xcode 11.4.1
 
 # v28.0.0 (2020-04-23)