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. PiperOrigin-RevId: 687399064
protocolbuffers · Oct 18, 2024 · 08be21c · 08be21c
1 parent c0a99b0
commit 08be21c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml
@@ -115,5 +115,5 @@ jobs:
           bazel: >-
             test ${{ matrix.targets }} ${{ matrix.flags }}
             --test_env=KOKORO_PYTHON_VERSION=${{ matrix.version }}
-            --macos_minimum_os=10.9
+            --macos_minimum_os=11.0
           exclude-targets: -//python/pb_unit_tests/...
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
@@ -32,8 +32,8 @@ Pod::Spec.new do |s|
 
   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'
   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
@@ -34,8 +34,8 @@ Pod::Spec.new do |s|
   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'
   s.tvos.deployment_target = '12.0'
   s.watchos.deployment_target = '6.0'
   s.visionos.deployment_target = '1.0'

diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh
@@ -7,7 +7,7 @@ set -eu
 # 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}"
 
 # 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
@@ -118,7 +118,7 @@ apple_binary(
         "-undefined,dynamic_lookup",
         "-multiply_defined,suppress",
     ],
-    minimum_os_version = "10.11",
+    minimum_os_version = "11",
     platform_type = "macos",
     tags = ["manual"],
     deps = [
@@ -133,7 +133,7 @@ apple_binary(
         "-undefined,dynamic_lookup",
         "-multiply_defined,suppress",
     ],
-    minimum_os_version = "10.11",
+    minimum_os_version = "11",
     platform_type = "macos",
     tags = ["manual"],
     deps = [

diff --git a/toolchain/BUILD.bazel b/toolchain/BUILD.bazel
@@ -108,7 +108,7 @@ cc_toolchain_config(
     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",
 )
 
 cc_toolchain_config(
@@ -125,7 +125,7 @@ cc_toolchain_config(
     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",
 )
 
 cc_toolchain_config(

diff --git a/toolchain/toolchains.bazelrc b/toolchain/toolchains.bazelrc
@@ -10,7 +10,7 @@ build:linux-s390_64 --config=cross_config --cpu=linux-s390_64
 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 --cpu=osx-aarch_64
+build:osx-x86_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=11 --cpu=osx-x86_64
 build:win32 --config=cross_config --cpu=win32
 build:win64 --config=cross_config --cpu=win64