Merge pull request #76451 from benlangmuir/9to6

Roll back to watchOS 6.0 to keep armv7k support

Author: benlangmuir

CMakeLists.txt

@@ -572,7 +572,7 @@ set(SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS "16.0" CACHE STRING
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "16.0" CACHE STRING
     "Minimum deployment target version for tvOS")
 
-set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "9.0" CACHE STRING
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "6.0" CACHE STRING
     "Minimum deployment target version for watchOS")
 
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_XROS "1.0" CACHE STRING

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -113,7 +113,7 @@ macro(configure_sdks_darwin)
   set(macosx_ver "13.0")
   set(iphoneos_ver "16.0")
   set(appletvos_ver "16.0")
-  set(watchos_ver "9.0")
+  set(watchos_ver "6.0")
 
   set(macosx_vendor "apple")
   set(iphoneos_vendor "apple")

utils/build-script-impl

@@ -104,7 +104,7 @@ KNOWN_SETTINGS=(
     darwin-deployment-version-ios                 "16.0"            "minimum deployment target version for iOS"
     darwin-deployment-version-osx                 "13.0"            "minimum deployment target version for OS X"
     darwin-deployment-version-tvos                "16.0"            "minimum deployment target version for tvOS"
-    darwin-deployment-version-watchos             "9.0"             "minimum deployment target version for watchOS"
+    darwin-deployment-version-watchos             "6.0"             "minimum deployment target version for watchOS"
     darwin-deployment-version-xros                "1.0"             "minimum deployment target version for xrOS"
     darwin-install-extract-symbols                ""                "whether to extract symbols with dsymutil during installations"
     darwin-install-extract-symbols-use-just-built-dsymutil "1"       "whether we should extract symbols using the just built dsymutil"

utils/build_swift/build_swift/defaults.py

@@ -55,7 +55,9 @@
 DARWIN_DEPLOYMENT_VERSION_OSX = '13.0'
 DARWIN_DEPLOYMENT_VERSION_IOS = '16.0'
 DARWIN_DEPLOYMENT_VERSION_TVOS = '16.0'
-DARWIN_DEPLOYMENT_VERSION_WATCHOS = '9.0'
+# FIXME: 9.0 would be the aligned watchOS version, but is held back to keep
+# support for armv7k (dropped in 9) and i386 simulator (dropped in 7)
+DARWIN_DEPLOYMENT_VERSION_WATCHOS = '6.0'
 DARWIN_DEPLOYMENT_VERSION_XROS = '1.0'
 
 UNIX_INSTALL_PREFIX = '/usr'

utils/gyb_foundation_support.py

@@ -12,7 +12,7 @@ def ObjectiveCBridgeableImplementationForNSValue(Type):
                         _getObjCTypeEncoding({Type}.self)) == 0,
                  "NSValue does not contain the right type to bridge to {Type}")
     result = {Type}()
-    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
+    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
       source.getValue(&result!, size: MemoryLayout<{Type}>.size)
     }} else {{
       source.getValue(&result!)
@@ -27,7 +27,7 @@ def ObjectiveCBridgeableImplementationForNSValue(Type):
       return false
     }}
     result = {Type}()
-    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
+    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
       source.getValue(&result!, size: MemoryLayout<{Type}>.size)
     }} else {{
       source.getValue(&result!)
@@ -42,7 +42,7 @@ def ObjectiveCBridgeableImplementationForNSValue(Type):
                         _getObjCTypeEncoding({Type}.self)) == 0,
                  "NSValue does not contain the right type to bridge to {Type}")
     var result = {Type}()
-    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *) {{
+    if #available(OSX 13.0, iOS 16.0, tvOS 16.0, watchOS 6.0, *) {{
       unwrappedSource.getValue(&result, size: MemoryLayout<{Type}>.size)
     }} else {{
       unwrappedSource.getValue(&result)