Upgrade protobuf to v3.15.5 (#51)

* Attempt to upgrade protobuf dep

* Update googletest

Author: nareddyt

repositories.bzl

@@ -92,10 +92,10 @@ cc_library(
         build_file_content = BUILD,
     )
 
-PROTOBUF_COMMIT = "3.10.1"  # Oct 29, 2019
-PROTOBUF_SHA256 = "6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7"
+PROTOBUF_COMMIT = "3.15.5"  # Mar 04, 2021
+PROTOBUF_SHA256 = "bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b"
 
-RULES_PROTO_SHA = "97d8af4dc474595af3900dd85cb3a29ad28cc313"
+RULES_PROTO_SHA = "97d8af4dc474595af3900dd85cb3a29ad28cc313"  # Oct 31, 2019
 RULES_PROTO_SHA256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208"
 
 def protobuf_repositories(bind = True):
@@ -116,95 +116,17 @@ def protobuf_repositories(bind = True):
         ],
     )
 
-GOOGLETEST_COMMIT = "43863938377a9ea1399c0596269e0890b5c5515a"
-GOOGLETEST_SHA256 = "7c8ece456ad588c30160429498e108e2df6f42a30888b3ec0abf5d9792d9d3a0"
+GOOGLETEST_COMMIT = "703bd9caab50b139428cea1aaff9974ebee5742e"  # v1.10.0: Oct 2, 2019
+GOOGLETEST_SHA256 = "d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d"
 
 def googletest_repositories(bind = True):
-    BUILD = """
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-#
-
-cc_library(
-    name = "googletest",
-    srcs = [
-        "googletest/src/gtest-all.cc",
-        "googlemock/src/gmock-all.cc",
-    ],
-    hdrs = glob([
-        "googletest/include/**/*.h",
-        "googlemock/include/**/*.h",
-        "googletest/src/*.cc",
-        "googletest/src/*.h",
-        "googlemock/src/*.cc",
-    ]),
-    includes = [
-        "googlemock",
-        "googletest",
-        "googletest/include",
-        "googlemock/include",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "googletest_main",
-    srcs = ["googlemock/src/gmock_main.cc"],
-    visibility = ["//visibility:public"],
-    linkopts = [
-        "-lpthread",
-    ],
-    deps = [":googletest"],
-)
-
-cc_library(
-    name = "googletest_prod",
-    hdrs = [
-        "googletest/include/gtest/gtest_prod.h",
-    ],
-    includes = [
-        "googletest/include",
-    ],
-    visibility = ["//visibility:public"],
-)
-"""
     http_archive(
-        name = "googletest_git",
+        name = "com_google_googletest",
         strip_prefix = "googletest-" + GOOGLETEST_COMMIT,
-        build_file_content = BUILD,
         url = "https://github.com/google/googletest/archive/" + GOOGLETEST_COMMIT + ".tar.gz",
         sha256 = GOOGLETEST_SHA256,
     )
 
-    if bind:
-        native.bind(
-            name = "googletest",
-            actual = "@googletest_git//:googletest",
-        )
-
-        native.bind(
-            name = "googletest_main",
-            actual = "@googletest_git//:googletest_main",
-        )
-
-        native.bind(
-            name = "googletest_prod",
-            actual = "@googletest_git//:googletest_prod",
-        )
-
 GOOGLEAPIS_COMMIT = "1d5522ad1056f16a6d593b8f3038d831e64daeea"  # Sept 03, 2020
 GOOGLEAPIS_SHA256 = "cd13e547cffaad217c942084fd5ae0985a293d0cce3e788c20796e5e2ea54758"
 

test/BUILD

@@ -26,8 +26,8 @@ cc_test(
     ],
     linkstatic = 1,
     deps = [
-        "//external:googletest_main",
         "//src:http_template",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -39,8 +39,8 @@ cc_test(
     ],
     linkstatic = 1,
     deps = [
-        "//external:googletest_main",
         "//src:path_matcher",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -52,8 +52,8 @@ cc_test(
     ],
     linkstatic = 1,
     deps = [
-        "//external:googletest_main",
         "//src:path_matcher_utility",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -64,8 +64,9 @@ cc_test(
         "prefix_writer_test.cc",
     ],
     deps = [
-        "//external:googletest_main",
         "//src:prefix_writer",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -76,9 +77,9 @@ cc_test(
         "request_weaver_test.cc",
     ],
     deps = [
-        "//external:googletest_main",
         "//src:request_weaver",
         "@com_google_absl//absl/strings",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -105,9 +106,9 @@ cc_test(
     ],
     deps = [
         ":test_common",
-        "//external:googletest_main",
         "//src:type_helper",
         "@com_google_googleapis//google/api:service_cc_proto",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -117,9 +118,9 @@ cc_library(
     srcs = ["test_common.cc"],
     hdrs = ["test_common.h"],
     deps = [
-        "//external:googletest",
         "//src:transcoder_input_stream",
         "@com_google_googleapis//google/api:service_cc_proto",
+        "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -138,10 +139,10 @@ cc_library(
     deps = [
         ":bookstore_cc_proto",
         ":test_common",
-        "//external:googletest",
         "//src:request_message_translator",
         "//src:type_helper",
         "@com_google_googleapis//google/api:service_cc_proto",
+        "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -159,8 +160,8 @@ cc_test(
         ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
-        "//external:googletest_main",
         "//src:request_message_translator",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -176,8 +177,8 @@ cc_test(
     deps = [
         ":bookstore_cc_proto",
         ":request_translator_test_base",
-        "//external:googletest_main",
         "//src:request_stream_translator",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -194,8 +195,8 @@ cc_test(
         ":bookstore_cc_proto",
         ":request_translator_test_base",
         ":test_common",
-        "//external:googletest_main",
         "//src:json_request_translator",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -207,8 +208,8 @@ cc_test(
     ],
     deps = [
         ":test_common",
-        "//external:googletest_main",
         "//src:message_reader",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -224,10 +225,10 @@ cc_test(
     deps = [
         ":bookstore_cc_proto",
         ":test_common",
-        "//external:googletest_main",
         "//src:message_reader",
         "//src:response_to_json_translator",
         "//src:type_helper",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -239,7 +240,7 @@ cc_test(
     ],
     deps = [
         ":test_common",
-        "//external:googletest_main",
         "//src:message_stream",
+        "@com_google_googletest//:gtest_main",
     ],
 )