Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync c-core 1.63.0 #251

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/prod_release_cocoapod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
TAG: ${{ github.event.release.tag_name }}
jobs:
release-cocoapod-gRPC-Core:
runs-on: macos-14
runs-on: macos-12
steps:
- name: Repo checkout
uses: actions/checkout@v3
Expand All @@ -28,7 +28,7 @@ jobs:
version=${TAG#v}
timeout 1h scripts/wait_for_pod_release.sh gRPC-Core $version
release-cocoapod-gRPC-Cpp:
runs-on: macos-14
runs-on: macos-12
needs: [release-cocoapod-gRPC-Core]
steps:
- name: Repo checkout
Expand All @@ -47,7 +47,7 @@ jobs:
version=${TAG#v}
timeout 1h scripts/wait_for_pod_release.sh gRPC-C++ $version
release-cocoapod-gRPC-RxLibrary:
runs-on: macos-14
runs-on: macos-12
steps:
- name: Repo checkout
uses: actions/checkout@v3
Expand All @@ -66,7 +66,7 @@ jobs:
timeout 1h scripts/wait_for_pod_release.sh gRPC-RxLibrary $version

release-cocoapod-gRPC:
runs-on: macos-14
runs-on: macos-12
needs: [release-cocoapod-gRPC-RxLibrary, release-cocoapod-gRPC-Core]
steps:
- name: Repo checkout
Expand All @@ -86,7 +86,7 @@ jobs:
timeout 1h scripts/wait_for_pod_release.sh gRPC $version

release-cocoapod-gRPC-ProtoRPC:
runs-on: macos-14
runs-on: macos-12
needs: [release-cocoapod-gRPC-RxLibrary, release-cocoapod-gRPC]
steps:
- name: Repo checkout
Expand Down
11 changes: 6 additions & 5 deletions gRPC-C++.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized
version = '1.63.0-pre2'
version = '1.63.0'
s.version = version
s.summary = 'gRPC C++ library'
s.homepage = 'https://grpc.io'
Expand Down Expand Up @@ -2786,8 +2786,10 @@ Pod::Spec.new do |s|

s.subspec 'Cronet-Interface' do |ss|
ss.header_mappings_dir = 'include/grpcpp'
ss.public_header_files = "include/grpcpp/security/cronet_credentials.h"
ss.source_files = "include/grpcpp/security/cronet_credentials.h"
ss.public_header_files = "include/grpcpp/security/cronet_credentials.h",
"include/grpcpp/security/cronet_credentials_impl.h"
ss.source_files = "include/grpcpp/security/cronet_credentials.h",
"include/grpcpp/security/cronet_credentials_impl.h"
end

s.subspec 'Cronet-Implementation' do |ss|
Expand All @@ -2798,8 +2800,7 @@ Pod::Spec.new do |s|

ss.dependency 'gRPC-Core/Cronet-Implementation', version

ss.source_files = "include/grpcpp/security/cronet_credentials.h",
"src/cpp/client/cronet_credentials.cc"
ss.source_files = "src/cpp/client/cronet_credentials.cc"
end

# patch include of openssl to openssl_grpc
Expand Down
2 changes: 1 addition & 1 deletion gRPC-Core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '1.63.0-pre2'
version = '1.63.0'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-ProtoRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
version = '1.63.0-pre2'
version = '1.63.0'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-RxLibrary.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
version = '1.63.0-pre2'
version = '1.63.0'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC'
version = '1.63.0-pre2'
version = '1.63.0'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io'
Expand Down
4 changes: 2 additions & 2 deletions include/grpcpp/version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define GRPC_CPP_VERSION_MAJOR 1
#define GRPC_CPP_VERSION_MINOR 63
#define GRPC_CPP_VERSION_PATCH 0
#define GRPC_CPP_VERSION_TAG "pre2"
#define GRPC_CPP_VERSION_STRING "1.63.0-pre2"
#define GRPC_CPP_VERSION_TAG ""
#define GRPC_CPP_VERSION_STRING "1.63.0"

#endif // GRPCPP_VERSION_INFO_H
1 change: 1 addition & 0 deletions scripts/prepare_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ set -ex
brew install coreutils

brew install pyyaml
pip3 install pyyaml || true
2 changes: 1 addition & 1 deletion scripts/release_cocoapod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ -z "$TARGET_PODSPEC" ]; then
fi

# Skip lint during pod trunk push
# ./scripts/skip_pod_push_lint.sh
./scripts/skip_pod_push_lint.sh

echo "Publishing podspec $TARGET_PODSPEC"

Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCCppPlugin'
v = '1.63.0-pre2'
v = '1.63.0'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pod::Spec.new do |s|
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.63.0-pre2'
v = '1.63.0'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/GRPCClient/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.

#define GRPC_OBJC_VERSION_STRING @"1.63.0-pre2"
#define GRPC_OBJC_VERSION_STRING @"1.63.0"
Loading