From 373dc8e89ec8a6dfabe003c9c9711caa5ee5b45d Mon Sep 17 00:00:00 2001
From: Andrew Morrow <acm@mongodb.com>
Date: Sun, 21 Oct 2018 12:31:50 -0400
Subject: SERVER-37684 Bump iOS minimum to 11 so we don't need to provide
 32-bit slices

(cherry picked from commit b9db97a9ec5644c00db39a02813e82daa814b692)
---
 etc/evergreen.yml            | 22 +++++++++++-----------
 etc/scons/xcode_ios.vars     |  4 ++--
 etc/scons/xcode_ios_sim.vars |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 7f00b6fe7c0..5245a013202 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3929,9 +3929,9 @@ tasks:
     - name: embedded_sdk_s3_put
       variant: embedded-sdk-macosx-10.10
     - name: embedded_sdk_s3_put
-      variant: embedded-sdk-iphoneos-10.2
+      variant: embedded-sdk-iphoneos-11.0
     - name: embedded_sdk_s3_put
-      variant: embedded-sdk-iphonesimulator-10.2
+      variant: embedded-sdk-iphonesimulator-11.0
     - name: embedded_sdk_s3_put
       variant: embedded-sdk-appletvos-10.2
     - name: embedded_sdk_s3_put
@@ -3961,7 +3961,7 @@ tasks:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        remote_file: ${project}/embedded-sdk/embedded-sdk-iphoneos-10.2/${revision}/mongo-embedded-sdk-${version}.tgz
+        remote_file: ${project}/embedded-sdk/embedded-sdk-iphoneos-11.0/${revision}/mongo-embedded-sdk-${version}.tgz
         bucket: mciuploads
         local_file: "mongo-embedded-sdk-${version}/iPhoneOS/embedded-sdk.tgz"
 
@@ -3969,7 +3969,7 @@ tasks:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        remote_file: ${project}/embedded-sdk/embedded-sdk-iphonesimulator-10.2/${revision}/mongo-embedded-sdk-${version}.tgz
+        remote_file: ${project}/embedded-sdk/embedded-sdk-iphonesimulator-11.0/${revision}/mongo-embedded-sdk-${version}.tgz
         bucket: mciuploads
         local_file: "mongo-embedded-sdk-${version}/iPhoneSimulator/embedded-sdk.tgz"
 
@@ -10512,8 +10512,8 @@ buildvariants:
   tasks:
   - name: embedded_sdk_build_and_test
 
-- name: embedded-sdk-iphoneos-10.2
-  display_name: "Embedded SDK - iOS 10.2"
+- name: embedded-sdk-iphoneos-11.0
+  display_name: "Embedded SDK - iOS 11.0"
   run_on:
   - macos-1012
   batchtime: 1440 # 1 day
@@ -10530,7 +10530,7 @@ buildvariants:
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DCMAKE_OSX_SYSROOT="$(xcrun --sdk iphoneos --show-sdk-path)"
         -DCMAKE_OSX_ARCHITECTURES=arm64
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.2
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
         -DENABLE_APPLE_FRAMEWORK=ON
         -DCMAKE_INSTALL_BINDIR=Frameworks
         -DENABLE_SSL=OFF
@@ -10544,8 +10544,8 @@ buildvariants:
   tasks:
   - name: embedded_sdk_build_and_test
 
-- name: embedded-sdk-iphonesimulator-10.2
-  display_name: "Embedded SDK - iOS Simulator 10.2"
+- name: embedded-sdk-iphonesimulator-11.0
+  display_name: "Embedded SDK - iOS Simulator 11.0"
   run_on:
   - macos-1012
   batchtime: 1440 # 1 day
@@ -10562,7 +10562,7 @@ buildvariants:
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DCMAKE_OSX_SYSROOT="$(xcrun --sdk iphonesimulator --show-sdk-path)"
         -DCMAKE_OSX_ARCHITECTURES=x86_64
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.2
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
         -DENABLE_APPLE_FRAMEWORK=ON
         -DCMAKE_INSTALL_BINDIR=Frameworks
         -DENABLE_SSL=OFF
@@ -10574,7 +10574,7 @@ buildvariants:
     disable_unit_tests: true
     enable_embedded_tests: ios_tvos_simulator
     ios_sim_device: iPhone-7
-    ios_sim_runtime: iOS-10-2
+    ios_sim_runtime: iOS-11-0
     dump_scons_config_on_failure: true
   tasks:
   - name: embedded_sdk_build_and_test
diff --git a/etc/scons/xcode_ios.vars b/etc/scons/xcode_ios.vars
index 4ae016d2e51..ad2e5b5b68f 100644
--- a/etc/scons/xcode_ios.vars
+++ b/etc/scons/xcode_ios.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'iphoneos', 'clang++']).s
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'iphoneos', '--show-sdk-path']).strip()
 
-CCFLAGS = "-isysroot {} -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -arch arm64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -arch arm64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "iOS"
 TARGET_ARCH = "aarch64"
diff --git a/etc/scons/xcode_ios_sim.vars b/etc/scons/xcode_ios_sim.vars
index cc13e2177fc..a4ddd9a403e 100644
--- a/etc/scons/xcode_ios_sim.vars
+++ b/etc/scons/xcode_ios_sim.vars
@@ -7,8 +7,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'iphonesimulator', 'clang
 
 sdk_path = subprocess.check_output(['xcrun', '--sdk', 'iphonesimulator', '--show-sdk-path']).strip()
 
-CCFLAGS = "-isysroot {} -miphoneos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path)
-LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=10.2 -arch x86_64 -fembed-bitcode".format(sdk_path)
+CCFLAGS = "-isysroot {} -miphoneos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
+LINKFLAGS = "-Wl,-syslibroot,{} -miphoneos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path)
 
 TARGET_OS = "iOS-sim"
 TARGET_ARCH = "x86_64"
-- 
cgit v1.2.1