Skip to content

Roll back to watchOS 6.0 to keep armv7k support #76451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Roll back to watchOS 6.0 to keep armv7k support #76451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion utils/build_swift/build_swift/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions utils/gyb_foundation_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!)
Expand All @@ -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!)
Expand All @@ -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)
Expand Down