aboutsummaryrefslogtreecommitdiff
path: root/ports/grpc
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-02-27 11:56:29 -0800
committerPhil Christensen <philc@microsoft.com>2019-02-27 11:56:29 -0800
commit2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch)
tree3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/grpc
parent3830517ec7519b823f5d8c404710889c6bd00278 (diff)
parent2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff)
downloadvcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz
vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/grpc')
-rw-r--r--ports/grpc/CONTROL2
-rw-r--r--ports/grpc/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index f7a46c9f6..274faed53 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
Source: grpc
-Version: 1.17.1
+Version: 1.18.0
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 77db34226..492025ff3 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -11,8 +11,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
- REF v1.17.1
- SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
+ REF v1.18.0
+ SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
HEAD_REF master
PATCHES fix-uwp.patch
)