瀏覽代碼

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.
David L. Jones 5 年之前
父節點
當前提交
f5a3b92cf7
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      BUILD
  2. 2 2
      WORKSPACE

+ 2 - 2
BUILD

@@ -14,10 +14,10 @@ exports_files(["LICENSE"])
 # build configuration
 # build configuration
 ################################################################################
 ################################################################################
 
 
+# TODO(yannic): Remove in 3.14.0.
 string_flag(
 string_flag(
     name = "incompatible_use_com_google_googletest",
     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"]
     values = ["true", "false"]
 )
 )
 
 

+ 2 - 2
WORKSPACE

@@ -29,13 +29,13 @@ bind(
     actual = "//util/python:python_headers",
     actual = "//util/python:python_headers",
 )
 )
 
 
-# TODO(yannic): Remove in 3.13.0.
+# TODO(yannic): Remove in 3.14.0.
 bind(
 bind(
     name = "gtest",
     name = "gtest",
     actual = "@com_google_googletest//:gtest",
     actual = "@com_google_googletest//:gtest",
 )
 )
 
 
-# TODO(yannic): Remove in 3.13.0.
+# TODO(yannic): Remove in 3.14.0.
 bind(
 bind(
     name = "gtest_main",
     name = "gtest_main",
     actual = "@com_google_googletest//:gtest_main",
     actual = "@com_google_googletest//:gtest_main",