update grpc and protobuf versions (hyperledger-iroha#1217)

* update grpc and protobuf versions

Signed-off-by: Victor Drobny <[email protected]>

cmake/Modules/Findgrpc.cmake

@@ -26,7 +26,7 @@ find_package_handle_standard_args(grpc DEFAULT_MSG
     )
 
 set(URL https://github.com/grpc/grpc)
-set(VERSION bfcbad3b86c7912968dc8e64f2121c920dad4dfb)
+set(VERSION bd44e485f69d70ca4095cea92decd98de3892aa6) # Release 1.11.0
 set_target_description(grpc "Remote Procedure Call library" ${URL} ${VERSION})
 
 if (NOT grpc_FOUND)
@@ -40,8 +40,6 @@ if (NOT grpc_FOUND)
         -DProtobuf_DIR=${EP_PREFIX}/src/google_protobuf-build/lib/cmake/protobuf
         -DgRPC_ZLIB_PROVIDER=package
         -DBUILD_SHARED_LIBS=ON
-      PATCH_COMMAND
-        ${GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/patch/fix-protobuf-package-include.patch || true
       BUILD_BYPRODUCTS
         ${EP_PREFIX}/src/grpc_grpc-build/grpc_cpp_plugin
         ${EP_PREFIX}/src/grpc_grpc-build/${CMAKE_SHARED_LIBRARY_PREFIX}gpr${CMAKE_SHARED_LIBRARY_SUFFIX}

cmake/Modules/Findprotobuf.cmake

@@ -19,7 +19,7 @@ find_package_handle_standard_args(protobuf DEFAULT_MSG
     )
 
 set(URL https://github.com/google/protobuf.git)
-set(VERSION 80a37e0782d2d702d52234b62dd4b9ec74fd2c95)
+set(VERSION 106ffc04be1abf3ff3399f54ccf149815b287dd9) # Protocol Buffers v3.5.1
 set_target_description(protobuf "Protocol buffers library" ${URL} ${VERSION})
 
 if (NOT protobuf_FOUND)

docker/develop/Dockerfile

@@ -55,10 +55,10 @@ RUN set -e; \
     ldconfig; \
     rm -rf /tmp/boost
 
-# install protobuf
+# install protobuf v3.5.1
 RUN set -e; \
     git clone https://github.com/google/protobuf /tmp/protobuf; \
-    (cd /tmp/protobuf ; git checkout 80a37e0782d2d702d52234b62dd4b9ec74fd2c95); \
+    (cd /tmp/protobuf ; git checkout 106ffc04be1abf3ff3399f54ccf149815b287dd9); \
     cmake \
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
         -Dprotobuf_BUILD_TESTS=OFF \
@@ -93,11 +93,11 @@ RUN set -e; \
     ldconfig; \
     rm -rf /tmp/c-ares
 
-# install grpc
+# install grpc 1.11.0
 RUN set -e; \
     git clone https://github.com/grpc/grpc /tmp/grpc; \
     cd /tmp/grpc; \
-    git checkout bfcbad3b86c7912968dc8e64f2121c920dad4dfb; \
+    git checkout bd44e485f69d70ca4095cea92decd98de3892aa6; \
     cmake \
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
         -DgRPC_BENCHMARK_PROVIDER="" \

docs/source/guides/dependencies.rst

@@ -226,7 +226,7 @@ Installation on macOS
 
     CMAKE_BUILD_TYPE="Release"
     git clone https://github.com/google/protobuf /tmp/protobuf;
-    (cd /tmp/protobuf ; git checkout 80a37e0782d2d702d52234b62dd4b9ec74fd2c95);
+    (cd /tmp/protobuf ; git checkout 106ffc04be1abf3ff3399f54ccf149815b287dd9);
     cmake \
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
         -Dprotobuf_BUILD_TESTS=OFF \

shared_model/packages/android/android-build.sh

@@ -80,9 +80,9 @@ fi
 tar xf ./boost_1_66_0.tar.gz
 cp -R ./boost_1_66_0/boost "$DEPS_DIR"/include
 
-# protobuf
+# protobuf v3.5.1
 git clone https://github.com/google/protobuf
-(cd ./protobuf ; git checkout b5fbb742af122b565925987e65c08957739976a7)
+(cd ./protobuf ; git checkout 106ffc04be1abf3ff3399f54ccf149815b287dd9)
 cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -H./protobuf/cmake -B./protobuf/host_build # build for host to get js_embed
 VERBOSE=1 cmake --build ./protobuf/host_build -- -j"$CORES"
 # to be able to run js_embed we need its host version

shared_model/packages/ios/ios-build.sh

@@ -78,10 +78,10 @@ curl -OL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.
 tar xf ./boost_1_66_0.tar.gz
 cp -R ./boost_1_66_0/boost "$DEPS_DIR"/include
 
-# protobuf
+# protobuf v3.5.1
 git clone https://github.com/google/protobuf
 (cd ./protobuf;
-git checkout 80a37e0782d2d702d52234b62dd4b9ec74fd2c95)
+git checkout 106ffc04be1abf3ff3399f54ccf149815b287dd9)
 cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -Dprotobuf_BUILD_TESTS=OFF -H./protobuf/cmake -B./protobuf/host_build # build for host to get js_embed
 VERBOSE=1 cmake --build ./protobuf/host_build -- -j"$CORES"
 # to be able to run js_embed we need its host version

shared_model/packages/javascript/scripts/install-dependencies.sh

@@ -20,8 +20,9 @@ git clone https://github.com/boostorg/boost /tmp/boost; \
     (cd /tmp/boost ; sudo /tmp/boost/b2 link=static cxxflags="-std=c++14" -j "$(getconf _NPROCESSORS_ONLN)" install); \
     rm -rf /tmp/boost
 
-# Protobuf (static)
-git clone --depth 1 --branch v3.5.1 https://github.com/google/protobuf
+# Protobuf (static) v3.5.1
+git clone https://github.com/google/protobuf
 cd protobuf
+git checkout 106ffc04be1abf3ff3399f54ccf149815b287dd9
 cmake -Hcmake/ -Bbuild -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
 sudo cmake --build build/ --target install -- -j"$(getconf _NPROCESSORS_ONLN)"

snap/snapcraft.yaml

@@ -60,7 +60,7 @@ parts:
       ./b2 cxxflags="-std=c++14" install
   protobuf:
     source: https://github.com/google/protobuf.git
-    source-commit: 80a37e0782d2d702d52234b62dd4b9ec74fd2c95
+    source-commit: 106ffc04be1abf3ff3399f54ccf149815b287dd9 # Protocol Buffers v3.5.1
     source-subdir: cmake
     plugin: cmake
     configflags: [-Dprotobuf_BUILD_TESTS=OFF, -Dprotobuf_BUILD_SHARED_LIBS=ON]
@@ -79,7 +79,7 @@ parts:
     after: [cmake]
   grpc:
     source: https://github.com/grpc/grpc.git
-    source-commit: bfcbad3b86c7912968dc8e64f2121c920dad4dfb
+    source-commit: bd44e485f69d70ca4095cea92decd98de3892aa6 # Release 1.11.0
     plugin: cmake
     configflags:
      - -DgRPC_ZLIB_PROVIDER=package