natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump iOS and OSX version

This commit is contained in:
Esun Kim 2020-09-25 11:44:06 -07:00
parent 32e4c1c1df
commit ccf3cbc6b7
48 changed files with 106 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -236,8 +236,8 @@ endif()
if(gRPC_BACKWARDS_COMPATIBILITY_MODE)
add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE)
if(_gRPC_PLATFORM_MAC)
# some C++11 constructs not supported before OS X 10.9
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
# some C++11 constructs not supported before OS X 10.10
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
endif()
endif()

4
examples/objective-c/BUILD
View File

@ -56,7 +56,7 @@ ios_application(
"ipad",
],
infoplists = ["helloworld/HelloWorld/Info.plist"],
minimum_os_version = "8.0",
minimum_os_version = "9.0",
tags = ["manual"],
deps = [":HelloWorld-lib"],
)
@ -113,7 +113,7 @@ ios_application(
"ipad",
],
infoplists = ["route_guide/Misc/Info.plist"],
minimum_os_version = "8.0",
minimum_os_version = "9.0",
tags = ["manual"],
deps = [":RouteGuideClient-lib"],
)

4
examples/objective-c/auth_sample/AuthTestService.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "AuthTestService example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = "7.1"
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
# Base directory where the .proto files are.
src = "../../protos"

4
examples/objective-c/helloworld/HelloWorld.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "HelloWorld example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = "7.1"
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
# Base directory where the .proto files are.
src = "../../protos"

2
examples/objective-c/helloworld/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

4
examples/objective-c/helloworld_macos/HelloWorld.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "HelloWorld example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = "7.1"
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
# Base directory where the .proto files are.
src = "../../protos"

2
examples/objective-c/helloworld_macos/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :macos, '10.9'
platform :macos, '10.10'
install! 'cocoapods', :deterministic_uuids => false

2
examples/objective-c/route_guide/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

4
examples/objective-c/route_guide/RouteGuide.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "RouteGuide example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = "7.1"
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.10"
# Base directory where the .proto files are.
src = "../../protos"

4
gRPC-C++.podspec
View File

@ -34,8 +34,8 @@ Pod::Spec.new do |s|
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.requires_arc = false

4
gRPC-Core.podspec
View File

@ -38,8 +38,8 @@ Pod::Spec.new do |s|
# which was released in Cocoapods v1.2.0.
s.cocoapods_version = '>= 1.2.0'
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
gRPC-ProtoRPC.podspec
View File

@ -33,8 +33,8 @@ Pod::Spec.new do |s|
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
gRPC-RxLibrary.podspec
View File

@ -33,8 +33,8 @@ Pod::Spec.new do |s|
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

26
gRPC.podspec
View File

@ -44,8 +44,8 @@ Pod::Spec.new do |s|
'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'
@ -70,8 +70,8 @@ Pod::Spec.new do |s|
"src/objective-c/GRPCClient/GRPCTypes.m"
ss.dependency "gRPC-RxLibrary/Interface", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -105,8 +105,8 @@ Pod::Spec.new do |s|
ss.dependency "#{s.name}/Interface-Legacy", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -141,8 +141,8 @@ Pod::Spec.new do |s|
ss.dependency 'gRPC-Core', version
ss.dependency 'gRPC-RxLibrary', version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -157,15 +157,15 @@ Pod::Spec.new do |s|
ss.dependency 'gRPC-Core/Cronet-Implementation', version
ss.dependency 'CronetFramework'
ss.ios.deployment_target = '8.0'
ss.ios.deployment_target = '9.0'
end
# CFStream is now default. Leaving this subspec only for compatibility purpose.
s.subspec 'CFStream' do |ss|
ss.dependency "#{s.name}/GRPCCore", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -176,8 +176,8 @@ Pod::Spec.new do |s|
ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}'
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end

18
include/grpc/impl/codegen/port_platform.h
View File

@ -208,23 +208,6 @@
#define GRPC_ARES 0
#else /* TARGET_OS_IPHONE */
#define GPR_PLATFORM_STRING "osx"
#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
#if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7
#define GPR_CPU_IPHONE 1
#define GPR_PTHREAD_TLS 1
#else /* __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 */
#define GPR_CPU_POSIX 1
/* TODO(vjpai): there is a reported issue in bazel build for Mac where __thread
in a header is currently not working (bazelbuild/bazel#4341). Remove
the following conditional and use GPR_GCC_TLS when that is fixed */
#ifndef GRPC_BAZEL_BUILD
#define GPR_GCC_TLS 1
#else /* GRPC_BAZEL_BUILD */
#define GPR_PTHREAD_TLS 1
#endif /* GRPC_BAZEL_BUILD */
#define GPR_APPLE_PTHREAD_NAME 1
#endif
#else /* __MAC_OS_X_VERSION_MIN_REQUIRED */
#define GPR_CPU_POSIX 1
/* TODO(vjpai): Remove the following conditional and use only GPR_GCC_TLS
when bazelbuild/bazel#4341 is fixed */
@ -233,7 +216,6 @@
#else /* GRPC_BAZEL_BUILD */
#define GPR_PTHREAD_TLS 1
#endif /* GRPC_BAZEL_BUILD */
#endif
#define GPR_POSIX_CRASH_HANDLER 1
#endif
#define GPR_APPLE 1

4
src/cpp/Protobuf-C++.podspec
View File

@ -25,8 +25,8 @@ Pod::Spec.new do |s|
s.header_mappings_dir = 'src'
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'

4
src/csharp/experimental/build_native_ext_for_ios.sh
View File

@ -28,8 +28,8 @@ function build {
PATH_CC="$(xcrun --sdk $SDK --find clang)"
PATH_CXX="$(xcrun --sdk $SDK --find clang++)"
CPPFLAGS="-O2 -Wframe-larger-than=16384 -arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -mios-version-min=6.0 -DPB_NO_PACKED_STRUCTS=1"
LDFLAGS="-arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -Wl,ios_version_min=6.0"
CPPFLAGS="-O2 -Wframe-larger-than=16384 -arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -mios-version-min=9.0 -DPB_NO_PACKED_STRUCTS=1"
LDFLAGS="-arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -Wl,ios_version_min=9.0"
# TODO(jtattermusch): revisit the build arguments
make -j4 static_csharp \

4
src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
View File

@ -102,8 +102,8 @@ Pod::Spec.new do |s|
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.13.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '2.0'

4
src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
View File

@ -104,8 +104,8 @@ Pod::Spec.new do |s|
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.13.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
# watchOS is disabled due to #20258.

4
src/objective-c/!ProtoCompiler.podspec
View File

@ -110,8 +110,8 @@ Pod::Spec.new do |s|
# Restrict the protobuf runtime version to the one supported by this version of protoc.
s.dependency 'Protobuf', '~> 3.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
src/objective-c/BoringSSL-GRPC.podspec
View File

@ -79,8 +79,8 @@ Pod::Spec.new do |s|
:commit => "88aeb757f1a415c71fb4cbf5af936ecae4bc8179",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.7'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

2
src/objective-c/CronetFramework.podspec
View File

@ -69,7 +69,7 @@ Pod::Spec.new do |s|
}
s.vendored_framework = "Cronet.framework"
s.author = "The Chromium Authors"
s.ios.deployment_target = "8.0"
s.ios.deployment_target = "9.0"
s.source = { :http => "https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework-v#{v}.zip"}
s.preserve_paths = "Cronet.framework"
s.public_header_files = "Cronet.framework/Headers/**/*{.h}"

6
src/objective-c/README.md
View File

@ -1,7 +1,7 @@
[![Cocoapods](https://img.shields.io/cocoapods/v/gRPC.svg)](https://cocoapods.org/pods/gRPC)
# gRPC for Objective-C
gRPC Objective C library provides Objective C API for users to make gRPC calls on iOS or OS X
platforms. Currently, the minimum supported iOS version is 7.0 and OS X version is 10.9 (Mavericks).
platforms. Currently, the minimum supported iOS version is 9.0 and OS X version is 10.10 (Yosemite).
While gRPC doesn't require the use of an IDL to describe the API of services, using one simplifies
usage and adds some interoperability guarantees. Here we use [Protocol Buffers][], and provide a
@ -43,8 +43,8 @@ Pod::Spec.new do |s|
s.summary = '...'
s.source = { :git => 'https://github.com/...' }
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
# Base directory where the .proto files are.
src = '.'

2
src/objective-c/examples/BUILD
View File

@ -77,7 +77,7 @@ ios_application(
"ipad",
],
infoplists = ["Sample/Sample/Info.plist"],
minimum_os_version = "8.0",
minimum_os_version = "9.0",
visibility = ["//visibility:public"],
deps = ["Sample-lib"],
)

2
src/objective-c/examples/InterceptorSample/Podfile
View File

@ -1,4 +1,4 @@
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

4
src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = 'RemoteTest example'
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

2
src/objective-c/examples/Sample/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

2
src/objective-c/examples/SwiftSample/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

2
src/objective-c/examples/watchOS-sample/Podfile
View File

@ -16,7 +16,7 @@ def grpc_deps
end
target 'watchOS-sample' do
platform :ios, '8.0'
platform :ios, '9.0'
grpc_deps
end

2
src/objective-c/manual_tests/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

6
src/objective-c/tests/BUILD
View File

@ -174,7 +174,7 @@ grpc_objc_testing_library(
ios_unit_test(
name = "UnitTests",
minimum_os_version = "8.0",
minimum_os_version = "9.0",
test_host = ":ios-host",
deps = [
":APIv2Tests-lib",
@ -188,7 +188,7 @@ ios_unit_test(
ios_unit_test(
name = "InteropTests",
minimum_os_version = "8.0",
minimum_os_version = "9.0",
test_host = ":ios-host",
deps = [
":InteropTestsLocalCleartext-lib",
@ -199,7 +199,7 @@ ios_unit_test(
macos_unit_test(
name = "MacTests",
minimum_os_version = "10.9",
minimum_os_version = "10.10",
deps = [
":APIv2Tests-lib",
":InteropTestsLocalCleartext-lib",

2
src/objective-c/tests/Connectivity/Podfile
View File

@ -1,5 +1,5 @@
install! 'cocoapods', :deterministic_uuids => false
platform :ios, '8.0'
platform :ios, '9.0'
# Location of gRPC's repo root relative to this file.
GRPC_LOCAL_SRC = '../../../..'

6
src/objective-c/tests/Podfile
View File

@ -35,13 +35,13 @@ end
InteropTests
).each do |target_name|
target target_name do
platform :ios, '8.0'
platform :ios, '9.0'
grpc_deps
end
end
target 'CronetTests' do
platform :ios, '8.0'
platform :ios, '9.0'
grpc_deps
pod 'gRPC/GRPCCoreCronet', :path => GRPC_LOCAL_SRC
@ -50,7 +50,7 @@ target 'CronetTests' do
end
target 'PerfTests' do
platform :ios, '8.0'
platform :ios, '9.0'
grpc_deps
pod 'gRPC/GRPCCoreCronet', :path => GRPC_LOCAL_SRC

4
src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "RemoteTest example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
templates/CMakeLists.txt.template
View File

@ -300,8 +300,8 @@
if(gRPC_BACKWARDS_COMPATIBILITY_MODE)
add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE)
if(_gRPC_PLATFORM_MAC)
# some C++11 constructs not supported before OS X 10.9
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
# some C++11 constructs not supported before OS X 10.10
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
endif()
endif()

4
templates/gRPC-C++.podspec.template
View File

@ -116,8 +116,8 @@
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.requires_arc = false

4
templates/gRPC-Core.podspec.template
View File

@ -115,8 +115,8 @@
# which was released in Cocoapods v1.2.0.
s.cocoapods_version = '>= 1.2.0'
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
templates/gRPC-ProtoRPC.podspec.template
View File

@ -35,8 +35,8 @@
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

4
templates/gRPC-RxLibrary.podspec.template
View File

@ -35,8 +35,8 @@
:tag => "v#{version}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

26
templates/gRPC.podspec.template
View File

@ -46,8 +46,8 @@
'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'
@ -72,8 +72,8 @@
"src/objective-c/GRPCClient/GRPCTypes.m"
ss.dependency "gRPC-RxLibrary/Interface", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -107,8 +107,8 @@
ss.dependency "#{s.name}/Interface-Legacy", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -143,8 +143,8 @@
ss.dependency 'gRPC-Core', version
ss.dependency 'gRPC-RxLibrary', version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -159,15 +159,15 @@
ss.dependency 'gRPC-Core/Cronet-Implementation', version
ss.dependency 'CronetFramework'
ss.ios.deployment_target = '8.0'
ss.ios.deployment_target = '9.0'
end
# CFStream is now default. Leaving this subspec only for compatibility purpose.
s.subspec 'CFStream' do |ss|
ss.dependency "#{s.name}/GRPCCore", version
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end
@ -178,8 +178,8 @@
ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}'
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
ss.ios.deployment_target = '7.0'
ss.osx.deployment_target = '10.9'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '4.0'
end

4
templates/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec.template
View File

@ -104,8 +104,8 @@
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.13.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '2.0'

4
templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
View File

@ -106,8 +106,8 @@
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.13.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
# watchOS is disabled due to #20258.

4
templates/src/objective-c/BoringSSL-GRPC.podspec.template
View File

@ -109,8 +109,8 @@
:commit => "${boringssl_commit}",
}
s.ios.deployment_target = '7.0'
s.osx.deployment_target = '10.7'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0'

2
test/core/iomgr/ios/CFStreamTests/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

2
test/cpp/cocoapods/Podfile
View File

@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false

2
test/cpp/ios/Podfile
View File

@ -7,7 +7,7 @@ GRPC_LOCAL_SRC = '../../..'
target 'CronetTests' do
platform :ios, '8.0'
platform :ios, '9.0'
pod 'Protobuf', :path => "#{GRPC_LOCAL_SRC}/third_party/protobuf", :inhibit_warnings => true
pod '!ProtoCompiler', :path => "#{GRPC_LOCAL_SRC}/src/objective-c"

4
test/cpp/ios/RemoteTestClientCpp/RemoteTestCpp.podspec
View File

@ -7,8 +7,8 @@ Pod::Spec.new do |s|
s.summary = "RemoteTest example"
s.source = { :git => 'https://github.com/grpc/grpc.git' }
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
# Run protoc with the C++ and gRPC plugins to generate protocol messages and gRPC clients.
s.dependency "!ProtoCompiler-gRPCCppPlugin"

6
tools/distrib/python/grpcio_tools/setup.py
View File

@ -144,10 +144,10 @@ elif "linux" in sys.platform or "darwin" in sys.platform:
if 'darwin' in sys.platform and PY3:
mac_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
if mac_target and (pkg_resources.parse_version(mac_target) <
pkg_resources.parse_version('10.9.0')):
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
pkg_resources.parse_version('10.10.0')):
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.10'
os.environ['_PYTHON_HOST_PLATFORM'] = re.sub(
r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1',
r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.10-\1',
util.get_platform())