Update to Xcode 10.2.1, Swift 4.2 (from 4.0). (#1088)

mozilla · May 6, 2019 · 2124c68 · 2124c68
1 parent d637cbd
commit 2124c68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -188,7 +188,7 @@ commands:
 jobs:
   Check Swift formatting:
     macos:
-      xcode: "10.1.0"
+      xcode: "10.2.1"
     steps:
       - checkout
       - run: brew install swiftlint swiftformat
@@ -250,7 +250,7 @@ jobs:
       - save-sccache-cache
   iOS build and test:
     macos:
-      xcode: "10.1.0"
+      xcode: "10.2.1"
     steps:
       - install-rust
       - setup-rust-toolchain
@@ -324,7 +324,7 @@ jobs:
           paths: MozillaAppServices.framework.zip
   Carthage release:
     macos:
-      xcode: "10.1.0"
+      xcode: "10.2.1"
     steps:
       - checkout
       - attach_workspace:

diff --git a/xcconfig/common.xcconfig b/xcconfig/common.xcconfig
@@ -13,7 +13,7 @@ DYLIB_CURRENT_VERSION = 1
 DYLIB_INSTALL_NAME_BASE = @rpath
 LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks @loader_path/Frameworks
 
-SWIFT_VERSION = 4.0
+SWIFT_VERSION = 4.2
 ENABLE_BITCODE = NO
 
 SWIFT_OPTIMIZATION_LEVEL_debug = -Onone