Update minimum supported macOS 11 This is per the updated OSS foundational support (https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md) since Chrome has raised its minimum macOS requirements. #test-continuous PiperOrigin-RevId: 688657808
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index bbaeb7a..4aac8cf 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml
@@ -115,5 +115,5 @@ bazel: >- test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_PYTHON_VERSION=${{ matrix.version }} - --macos_minimum_os=10.15 + --macos_minimum_os=11.0 exclude-targets: -//python/pb_unit_tests/...
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 99513aa..fb18117 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec
@@ -32,8 +32,10 @@ s.header_mappings_dir = 'src' - s.ios.deployment_target = '12.0' - s.osx.deployment_target = '10.13' + s.ios.deployment_target = '15.0' + s.osx.deployment_target = '11.0' + # The following are best-effort / community supported, and are not covered by + # our official support policies: https://protobuf.dev/support/version-support/ s.tvos.deployment_target = '12.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0'
diff --git a/Protobuf.podspec b/Protobuf.podspec index b16899e..1ff0054 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec
@@ -34,8 +34,10 @@ s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.13' + s.ios.deployment_target = '15.0' + s.osx.deployment_target = '11.0' + # The following are best-effort / community supported, and are not covered by + # our official support policies: https://protobuf.dev/support/version-support/ s.tvos.deployment_target = '12.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0'
diff --git a/conformance/README.md b/conformance/README.md index 24f1cbe..aea173f 100644 --- a/conformance/README.md +++ b/conformance/README.md
@@ -70,7 +70,7 @@ Objective-C (Mac only): - $ `bazel test //objectivec:conformance_test --macos_minimum_os=10.9 + $ `bazel test //objectivec:conformance_test --macos_minimum_os=11.0` Ruby:
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 861143a..8abebfe 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh
@@ -7,7 +7,7 @@ # Some base locations. readonly ScriptDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")") readonly ProtoRootDir="${ScriptDir}/../.." -readonly BazelFlags="${BAZEL_FLAGS:---announce_rc --macos_minimum_os=10.13}" +readonly BazelFlags="${BAZEL_FLAGS:---announce_rc --macos_minimum_os=11.0}" # Invoke with BAZEL=bazelisk to use that instead. readonly BazelBin="${BAZEL:-bazel}"
diff --git a/ruby/ext/google/protobuf_c/BUILD.bazel b/ruby/ext/google/protobuf_c/BUILD.bazel index ed91b2c..33c42bd 100644 --- a/ruby/ext/google/protobuf_c/BUILD.bazel +++ b/ruby/ext/google/protobuf_c/BUILD.bazel
@@ -118,7 +118,7 @@ "-undefined,dynamic_lookup", "-multiply_defined,suppress", ], - minimum_os_version = "10.11", + minimum_os_version = "11.0", platform_type = "macos", tags = ["manual"], deps = [ @@ -133,7 +133,7 @@ "-undefined,dynamic_lookup", "-multiply_defined,suppress", ], - minimum_os_version = "10.11", + minimum_os_version = "11.0", platform_type = "macos", tags = ["manual"], deps = [
diff --git a/toolchain/BUILD.bazel b/toolchain/BUILD.bazel index add1324..524fa14 100644 --- a/toolchain/BUILD.bazel +++ b/toolchain/BUILD.bazel
@@ -108,7 +108,7 @@ linker_path = "/usr/tools", sysroot = "/usr/tools/xcode_14_0/macosx", target_cpu = "aarch64", - target_full_name = "aarch64-apple-macosx10.15", + target_full_name = "aarch64-apple-macosx11.0", ) cc_toolchain_config( @@ -125,7 +125,7 @@ linker_path = "/usr/tools", sysroot = "/usr/tools/xcode_14_0/macosx", target_cpu = "x86_64", - target_full_name = "x86_64-apple-macosx10.15", + target_full_name = "x86_64-apple-macosx11.0", ) cc_toolchain_config(
diff --git a/toolchain/toolchains.bazelrc b/toolchain/toolchains.bazelrc index cd98412..79ea8e5 100644 --- a/toolchain/toolchains.bazelrc +++ b/toolchain/toolchains.bazelrc
@@ -10,7 +10,7 @@ build:linux-x86_32 --config=cross_config --cpu=linux-x86_32 build:linux-i386 --config=cross_config --cpu=linux-x86_32 build:linux-x86_64 --config=cross_config --cpu=linux-x86_64 -build:osx-aarch_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=10.15 --cpu=osx-aarch_64 -build:osx-x86_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=10.15 --cpu=osx-x86_64 +build:osx-aarch_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=11.0 --cpu=osx-aarch_64 +build:osx-x86_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=11.0 --cpu=osx-x86_64 build:win32 --config=cross_config --cpu=win32 build:win64 --config=cross_config --cpu=win64