Skip to content

Commit a159ece

Browse files
HannahShiSFBHannahShiSFB
committed
Sync c-core 1.72.0-pre1
1 parent d2158a5 commit a159ece

File tree

491 files changed

+12674
-15311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

491 files changed

+12674
-15311
lines changed

‎gRPC-C++.podspec‎

Lines changed: 55 additions & 64 deletions
Large diffs are not rendered by default.

‎gRPC-Core.podspec‎

Lines changed: 71 additions & 82 deletions
Large diffs are not rendered by default.

‎gRPC-ProtoRPC.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-ProtoRPC'
24-
version = '1.72.0-dev'
24+
version = '1.72.0-pre1'
2525
s.version = version
2626
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
2727
s.homepage = 'https://grpc.io'
@@ -33,8 +33,8 @@ Pod::Spec.new do |s|
3333
:tag => "v#{version}",
3434
}
3535

36-
s.ios.deployment_target = '11.0'
37-
s.osx.deployment_target = '10.14'
36+
s.ios.deployment_target = '15.0'
37+
s.osx.deployment_target = '11.0'
3838
s.tvos.deployment_target = '13.0'
3939
s.watchos.deployment_target = '6.0'
4040
s.visionos.deployment_target = '1.0'
@@ -55,7 +55,7 @@ Pod::Spec.new do |s|
5555
ss.header_mappings_dir = "src/objective-c/ProtoRPC"
5656
ss.dependency "#{s.name}/Legacy-Header", version
5757
ss.dependency 'gRPC/Interface', version
58-
ss.dependency 'Protobuf', '~> 3.0'
58+
ss.dependency 'Protobuf', '~> 4.0'
5959

6060
ss.source_files = "src/objective-c/ProtoRPC/ProtoMethod.{h,m}",
6161
"src/objective-c/ProtoRPC/ProtoRPC.{h,m}",
@@ -68,7 +68,7 @@ Pod::Spec.new do |s|
6868
ss.dependency "#{s.name}/Legacy-Header", version
6969
ss.dependency 'gRPC/GRPCCore', version
7070
ss.dependency 'gRPC-RxLibrary', version
71-
ss.dependency 'Protobuf', '~> 3.0'
71+
ss.dependency 'Protobuf', '~> 4.0'
7272

7373
ss.source_files = "src/objective-c/ProtoRPC/ProtoRPCLegacy.m",
7474
"src/objective-c/ProtoRPC/ProtoServiceLegacy.m"

‎gRPC-RxLibrary.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
Pod::Spec.new do |s|
2323
s.name = 'gRPC-RxLibrary'
24-
version = '1.72.0-dev'
24+
version = '1.72.0-pre1'
2525
s.version = version
2626
s.summary = 'Reactive Extensions library for iOS/OSX.'
2727
s.homepage = 'https://grpc.io'
@@ -33,8 +33,8 @@ Pod::Spec.new do |s|
3333
:tag => "v#{version}",
3434
}
3535

36-
s.ios.deployment_target = '11.0'
37-
s.osx.deployment_target = '10.14'
36+
s.ios.deployment_target = '15.0'
37+
s.osx.deployment_target = '11.0'
3838
s.tvos.deployment_target = '13.0'
3939
s.watchos.deployment_target = '6.0'
4040
s.visionos.deployment_target = '1.0'

‎gRPC.podspec‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
Pod::Spec.new do |s|
2222
s.name = 'gRPC'
23-
version = '1.72.0-dev'
23+
version = '1.72.0-pre1'
2424
s.version = version
2525
s.summary = 'gRPC client library for iOS/OSX'
2626
s.homepage = 'https://grpc.io'
@@ -45,8 +45,8 @@ Pod::Spec.new do |s|
4545
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
4646
}
4747

48-
s.ios.deployment_target = '11.0'
49-
s.osx.deployment_target = '10.14'
48+
s.ios.deployment_target = '15.0'
49+
s.osx.deployment_target = '11.0'
5050
s.tvos.deployment_target = '13.0'
5151
s.watchos.deployment_target = '6.0'
5252
s.visionos.deployment_target = '1.0'
@@ -64,24 +64,22 @@ Pod::Spec.new do |s|
6464

6565
ss.public_header_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
6666
"src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
67-
"src/objective-c/GRPCClient/GRPCCall+Cronet.h",
6867
"src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
6968
"src/objective-c/GRPCClient/GRPCCall+Tests.h",
7069
"src/objective-c/GRPCClient/GRPCCallLegacy.h",
7170
"src/objective-c/GRPCClient/GRPCTypes.h"
7271

7372
ss.source_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
7473
"src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
75-
"src/objective-c/GRPCClient/GRPCCall+Cronet.h",
7674
"src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
7775
"src/objective-c/GRPCClient/GRPCCall+Tests.h",
7876
"src/objective-c/GRPCClient/GRPCCallLegacy.h",
7977
"src/objective-c/GRPCClient/GRPCTypes.h",
8078
"src/objective-c/GRPCClient/GRPCTypes.mm"
8179
ss.dependency "gRPC-RxLibrary/Interface", version
8280
ss.dependency "#{s.name}/Privacy", version
83-
s.ios.deployment_target = '11.0'
84-
s.osx.deployment_target = '10.14'
81+
s.ios.deployment_target = '15.0'
82+
s.osx.deployment_target = '11.0'
8583
s.tvos.deployment_target = '13.0'
8684
s.watchos.deployment_target = '6.0'
8785
s.visionos.deployment_target = '1.0'
@@ -116,8 +114,8 @@ Pod::Spec.new do |s|
116114

117115
ss.dependency "#{s.name}/Interface-Legacy", version
118116
ss.dependency "#{s.name}/Privacy", version
119-
s.ios.deployment_target = '11.0'
120-
s.osx.deployment_target = '10.14'
117+
s.ios.deployment_target = '15.0'
118+
s.osx.deployment_target = '11.0'
121119
s.tvos.deployment_target = '13.0'
122120
s.watchos.deployment_target = '6.0'
123121
s.visionos.deployment_target = '1.0'
@@ -127,7 +125,6 @@ Pod::Spec.new do |s|
127125
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
128126

129127
ss.public_header_files = 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h',
130-
'src/objective-c/GRPCClient/GRPCCall+Cronet.h',
131128
'src/objective-c/GRPCClient/GRPCCall+OAuth2.h',
132129
'src/objective-c/GRPCClient/GRPCCall+Tests.h',
133130
'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h'
@@ -137,8 +134,6 @@ Pod::Spec.new do |s|
137134
'src/objective-c/GRPCClient/GRPCCall+ChannelArg.mm',
138135
'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h',
139136
'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.mm',
140-
'src/objective-c/GRPCClient/GRPCCall+Cronet.h',
141-
'src/objective-c/GRPCClient/GRPCCall+Cronet.mm',
142137
'src/objective-c/GRPCClient/GRPCCall+OAuth2.h',
143138
'src/objective-c/GRPCClient/GRPCCall+OAuth2.mm',
144139
'src/objective-c/GRPCClient/GRPCCall+Tests.h',
@@ -154,33 +149,19 @@ Pod::Spec.new do |s|
154149
ss.dependency 'gRPC-Core', version
155150
ss.dependency 'gRPC-RxLibrary', version
156151

157-
s.ios.deployment_target = '11.0'
158-
s.osx.deployment_target = '10.14'
152+
s.ios.deployment_target = '15.0'
153+
s.osx.deployment_target = '11.0'
159154
s.tvos.deployment_target = '13.0'
160155
s.watchos.deployment_target = '6.0'
161156
s.visionos.deployment_target = '1.0'
162157
end
163158

164-
s.subspec 'GRPCCoreCronet' do |ss|
165-
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
166-
167-
ss.source_files = 'src/objective-c/GRPCClient/GRPCCall+Cronet.h',
168-
'src/objective-c/GRPCClient/GRPCCall+Cronet.mm',
169-
'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,mm}'
170-
ss.dependency "#{s.name}/GRPCCore", version
171-
ss.dependency "#{s.name}/Privacy", version
172-
ss.dependency 'gRPC-Core/Cronet-Implementation', version
173-
ss.dependency 'CronetFramework'
174-
175-
ss.ios.deployment_target = '11.0'
176-
end
177-
178159
# CFStream is now default. Leaving this subspec only for compatibility purpose.
179160
s.subspec 'CFStream' do |ss|
180161
ss.dependency "#{s.name}/GRPCCore", version
181162

182-
s.ios.deployment_target = '11.0'
183-
s.osx.deployment_target = '10.14'
163+
s.ios.deployment_target = '15.0'
164+
s.osx.deployment_target = '11.0'
184165
s.tvos.deployment_target = '13.0'
185166
s.watchos.deployment_target = '6.0'
186167
s.visionos.deployment_target = '1.0'
@@ -192,8 +173,8 @@ Pod::Spec.new do |s|
192173
ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,mm}'
193174
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
194175

195-
s.ios.deployment_target = '11.0'
196-
s.osx.deployment_target = '10.14'
176+
s.ios.deployment_target = '15.0'
177+
s.osx.deployment_target = '11.0'
197178
s.tvos.deployment_target = '13.0'
198179
s.watchos.deployment_target = '6.0'
199180
s.visionos.deployment_target = '1.0'

‎include/grpc/grpc_cronet.h‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)