commit 6f459741f218a76f81787869cef4b93448d06e91
author Han-Wen Nienhuys <hanwen@google.com> Thu Jan 14 17:32:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 14 17:32:28 2021 +0000
tree 6eed4ed448ec86e4d9eea6c47e92d6664342611f
parent bc54db9fa01d45725016433b3c7887c8ee6f12c6
parent 0876e29f71d70851310a3ae3019fc1c1678a9331

Merge "Move Truth to nongoogle.bzl"

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 127ca3b..6c4b4e9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -830,32 +830,6 @@
     sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
 )
 
-TRUTH_VERS = "1.1"
-
-maven_jar(
-    name = "truth",
-    artifact = "com.google.truth:truth:" + TRUTH_VERS,
-    sha1 = "6a096a16646559c24397b03f797d0c9d75ee8720",
-)
-
-maven_jar(
-    name = "truth-java8-extension",
-    artifact = "com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERS,
-    sha1 = "258db6eb8df61832c5c059ed2bc2e1c88683e92f",
-)
-
-maven_jar(
-    name = "truth-liteproto-extension",
-    artifact = "com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERS,
-    sha1 = "bf65afa13aa03330e739bcaa5d795fe0f10fbf20",
-)
-
-maven_jar(
-    name = "truth-proto-extension",
-    artifact = "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERS,
-    sha1 = "64cba89cf87c1d84cb8c81d06f0b9c482f10b4dc",
-)
-
 maven_jar(
     name = "diffutils",
     artifact = "com.googlecode.java-diff-utils:diffutils:1.3.0",

lib/nongoogle_test.sh

diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh
index bf53eb6..67016a8 100755
--- a/lib/nongoogle_test.sh
+++ b/lib/nongoogle_test.sh
@@ -43,6 +43,10 @@
 sshd-osgi
 testcontainers
 testcontainers-elasticsearch
+truth
+truth-java8-extension
+truth-liteproto-extension
+truth-proto-extension
 tukaani-xz
 visible-assertions
 xerces

tools/nongoogle.bzl

diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 494ef66..db78c8d 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -256,3 +256,29 @@
         artifact = "com.google.jimfs:jimfs:1.2",
         sha1 = "48462eb319817c90c27d377341684b6b81372e08",
     )
+
+    TRUTH_VERS = "1.1"
+
+    maven_jar(
+        name = "truth",
+        artifact = "com.google.truth:truth:" + TRUTH_VERS,
+        sha1 = "6a096a16646559c24397b03f797d0c9d75ee8720",
+    )
+
+    maven_jar(
+        name = "truth-java8-extension",
+        artifact = "com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERS,
+        sha1 = "258db6eb8df61832c5c059ed2bc2e1c88683e92f",
+    )
+
+    maven_jar(
+        name = "truth-liteproto-extension",
+        artifact = "com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERS,
+        sha1 = "bf65afa13aa03330e739bcaa5d795fe0f10fbf20",
+    )
+
+    maven_jar(
+        name = "truth-proto-extension",
+        artifact = "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERS,
+        sha1 = "64cba89cf87c1d84cb8c81d06f0b9c482f10b4dc",
+    )