Swap back default macOS and tvOS SDK versions
These seem to have been accidentally switched around in https://github.com/bazelbuild/bazel/commit/8a1584e77c5c71e98a8cac87e6c5df6ee5d94c63, which caused the following error message to show when I try to build any C++ code on my Sonoma M1 Macbook:
clang: error: invalid version number in '-mmacosx-version-min=9.0'
Turns out my XCode was out of date anyway, but this should probably still be fixed.
PiperOrigin-RevId: 626345237
Change-Id: I80b67b11e8bf4786cd4c5771d318d564ec170209
diff --git a/src/main/starlark/builtins_bzl/common/xcode/providers.bzl b/src/main/starlark/builtins_bzl/common/xcode/providers.bzl
index 9b82a4e..058f77f 100644
--- a/src/main/starlark/builtins_bzl/common/xcode/providers.bzl
+++ b/src/main/starlark/builtins_bzl/common/xcode/providers.bzl
@@ -178,8 +178,8 @@
*,
xcode_version,
default_ios_sdk_version = "8.4",
- default_macos_sdk_version = "9.0",
- default_tvos_sdk_version = "10.11",
+ default_macos_sdk_version = "10.11",
+ default_tvos_sdk_version = "9.0",
default_watchos_sdk_version = "2.0",
default_visionos_sdk_version = "1.0"):
# Ensure that all fields get default values if they weren't specified.
diff --git a/src/main/starlark/builtins_bzl/common/xcode/xcode_version.bzl b/src/main/starlark/builtins_bzl/common/xcode/xcode_version.bzl
index be51fcb..e93bafc 100644
--- a/src/main/starlark/builtins_bzl/common/xcode/xcode_version.bzl
+++ b/src/main/starlark/builtins_bzl/common/xcode/xcode_version.bzl
@@ -42,8 +42,8 @@
"default_ios_sdk_version": attr.string(default = "8.4", doc = "The iOS SDK version that is used by default when this version of Xcode is being used. The `--ios_sdk_version` build flag will override the value specified here.", mandatory = False),
"default_visionos_sdk_version": attr.string(default = "1.0", doc = "The visionOS SDK version that is used by default when this version of Xcode is being used.", mandatory = False),
"default_watchos_sdk_version": attr.string(default = "2.0", doc = "The watchOS SDK version that is used by default when this version of Xcode is being used. The `--watchos_sdk_version` build flag will override the value specified here.", mandatory = False),
- "default_tvos_sdk_version": attr.string(default = "10.11", doc = "The tvOS SDK version that is used by default when this version of Xcode is being used. The `--tvos_sdk_version` build flag will override the value specified here.", mandatory = False),
- "default_macos_sdk_version": attr.string(default = "9.0", doc = "The macOS SDK version that is used by default when this version of Xcode is being used. The `--macos_sdk_version` build flag will override the value specified here.", mandatory = False),
+ "default_tvos_sdk_version": attr.string(default = "9.0", doc = "The tvOS SDK version that is used by default when this version of Xcode is being used. The `--tvos_sdk_version` build flag will override the value specified here.", mandatory = False),
+ "default_macos_sdk_version": attr.string(default = "10.11", doc = "The macOS SDK version that is used by default when this version of Xcode is being used. The `--macos_sdk_version` build flag will override the value specified here.", mandatory = False),
},
implementation = _xcode_version_impl,
)
