From f5a3b92cf7b379f2b8c33e8b30ca029a368be512 Mon Sep 17 00:00:00 2001
From: "David L. Jones" <dlj@google.com>
Date: Fri, 2 Oct 2020 20:10:51 -0700
Subject: [PATCH] Update default dependency for gtest. (#7907)

The gtest source was changed in #7237 on an opt-in basis, and has been
released since 3.12.0. The comments state that the default should change
in 3.13.0, but that didn't quite happen.

This change does flip the default, and updates comments to say 3.14.0.
---
 BUILD     | 4 ++--
 WORKSPACE | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BUILD b/BUILD
index 2b00637dd3..92e4091db3 100644
--- a/BUILD
+++ b/BUILD
@@ -14,10 +14,10 @@ exports_files(["LICENSE"])
 # build configuration
 ################################################################################
 
+# TODO(yannic): Remove in 3.14.0.
 string_flag(
     name = "incompatible_use_com_google_googletest",
-    # TODO(yannic): Flip to `true` for `3.13.0`.
-    build_setting_default = "false",
+    build_setting_default = "true",
     values = ["true", "false"]
 )
 
diff --git a/WORKSPACE b/WORKSPACE
index cb16ae882c..5a767a97c0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -29,13 +29,13 @@ bind(
     actual = "//util/python:python_headers",
 )
 
-# TODO(yannic): Remove in 3.13.0.
+# TODO(yannic): Remove in 3.14.0.
 bind(
     name = "gtest",
     actual = "@com_google_googletest//:gtest",
 )
 
-# TODO(yannic): Remove in 3.13.0.
+# TODO(yannic): Remove in 3.14.0.
 bind(
     name = "gtest_main",
     actual = "@com_google_googletest//:gtest_main",