From 94fd307693dfa84dfb11aadd00ead3f06dd5c225 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 14 May 2018 16:44:16 -0700 Subject: [PATCH] Move Truth rules to a subdirectory of lib The list of supported Truth extensions is only going to grow. Change-Id: Ic67a9df6a7548d964fc10b13c10b6db1c96e514e --- gerrit-gwtui/BUILD | 2 +- java/com/google/gerrit/acceptance/BUILD | 4 ++-- .../google/gerrit/common/data/testing/BUILD | 2 +- .../gerrit/extensions/common/testing/BUILD | 2 +- .../gerrit/extensions/restapi/testing/BUILD | 2 +- java/com/google/gerrit/git/testing/BUILD | 4 ++-- .../google/gerrit/server/cache/testing/BUILD | 2 +- .../google/gerrit/server/group/testing/BUILD | 2 +- java/com/google/gerrit/testing/BUILD | 2 +- java/com/google/gerrit/truth/BUILD | 2 +- javatests/com/google/gerrit/acceptance/BUILD | 2 +- .../google/gerrit/acceptance/api/group/BUILD | 2 +- .../gerrit/acceptance/rest/project/BUILD | 4 ++-- javatests/com/google/gerrit/common/BUILD | 4 ++-- .../com/google/gerrit/elasticsearch/BUILD | 2 +- javatests/com/google/gerrit/extensions/BUILD | 2 +- .../google/gerrit/extensions/conditions/BUILD | 2 +- javatests/com/google/gerrit/git/testing/BUILD | 2 +- javatests/com/google/gerrit/gpg/BUILD | 2 +- javatests/com/google/gerrit/httpd/BUILD | 2 +- javatests/com/google/gerrit/index/BUILD | 2 +- .../com/google/gerrit/metrics/proc/BUILD | 2 +- javatests/com/google/gerrit/pgm/BUILD | 2 +- javatests/com/google/gerrit/reviewdb/BUILD | 2 +- javatests/com/google/gerrit/server/BUILD | 4 ++-- .../com/google/gerrit/server/cache/BUILD | 2 +- .../com/google/gerrit/server/cache/h2/BUILD | 2 +- .../com/google/gerrit/server/group/db/BUILD | 2 +- .../google/gerrit/server/query/account/BUILD | 4 ++-- .../google/gerrit/server/query/change/BUILD | 4 ++-- .../google/gerrit/server/query/group/BUILD | 4 ++-- .../google/gerrit/server/query/project/BUILD | 2 +- .../com/google/gerrit/server/rules/BUILD | 2 +- .../com/google/gerrit/server/update/BUILD | 6 ++--- javatests/com/google/gerrit/sshd/BUILD | 2 +- javatests/com/google/gerrit/testing/BUILD | 2 +- javatests/com/google/gerrit/util/http/BUILD | 2 +- javatests/com/google/gwtexpui/safehtml/BUILD | 2 +- lib/BUILD | 22 ------------------- lib/truth/BUILD | 21 ++++++++++++++++++ 40 files changed, 69 insertions(+), 70 deletions(-) create mode 100644 lib/truth/BUILD diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD index a6c97630d6..56ac0eaa5a 100644 --- a/gerrit-gwtui/BUILD +++ b/gerrit-gwtui/BUILD @@ -34,8 +34,8 @@ junit_tests( "//java/com/google/gerrit/common:client", "//java/com/google/gerrit/extensions:client", "//lib:junit", - "//lib:truth", "//lib/gwt:dev", "//lib/gwt:user", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index acd5130ab4..abfdcea561 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -77,8 +77,6 @@ java_library2( "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:jimfs", - "//lib:truth", - "//lib:truth-java8-extension", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", "//lib/httpcomponents:fluent-hc", @@ -88,6 +86,8 @@ java_library2( "//lib/jgit/org.eclipse.jgit.junit:junit", "//lib/log:impl_log4j", "//lib/log:log4j", + "//lib/truth", + "//lib/truth:truth-java8-extension", "//prolog:gerrit-prolog-common", ], visibility = ["//visibility:public"], diff --git a/java/com/google/gerrit/common/data/testing/BUILD b/java/com/google/gerrit/common/data/testing/BUILD index 83f1c06ab1..3899e39280 100644 --- a/java/com/google/gerrit/common/data/testing/BUILD +++ b/java/com/google/gerrit/common/data/testing/BUILD @@ -6,6 +6,6 @@ java_library( deps = [ "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/reviewdb:server", - "//lib:truth", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD index 82dd425223..94fecbf670 100644 --- a/java/com/google/gerrit/extensions/common/testing/BUILD +++ b/java/com/google/gerrit/extensions/common/testing/BUILD @@ -6,7 +6,7 @@ java_library( deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/truth", - "//lib:truth", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/extensions/restapi/testing/BUILD b/java/com/google/gerrit/extensions/restapi/testing/BUILD index d035816bfe..434591ef88 100644 --- a/java/com/google/gerrit/extensions/restapi/testing/BUILD +++ b/java/com/google/gerrit/extensions/restapi/testing/BUILD @@ -6,6 +6,6 @@ java_library( deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/truth", - "//lib:truth", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/git/testing/BUILD b/java/com/google/gerrit/git/testing/BUILD index 0b835603b7..49003398d1 100644 --- a/java/com/google/gerrit/git/testing/BUILD +++ b/java/com/google/gerrit/git/testing/BUILD @@ -7,8 +7,8 @@ java_library( deps = [ "//java/com/google/gerrit/common:annotations", "//lib:guava", - "//lib:truth", - "//lib:truth-java8-extension", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", + "//lib/truth:truth-java8-extension", ], ) diff --git a/java/com/google/gerrit/server/cache/testing/BUILD b/java/com/google/gerrit/server/cache/testing/BUILD index c1293f919a..ed412afca3 100644 --- a/java/com/google/gerrit/server/cache/testing/BUILD +++ b/java/com/google/gerrit/server/cache/testing/BUILD @@ -7,7 +7,7 @@ java_library( deps = [ "//lib:guava", "//lib:protobuf", - "//lib:truth", "//lib/commons:lang3", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/server/group/testing/BUILD b/java/com/google/gerrit/server/group/testing/BUILD index 134de78abc..605a239fd0 100644 --- a/java/com/google/gerrit/server/group/testing/BUILD +++ b/java/com/google/gerrit/server/group/testing/BUILD @@ -8,7 +8,7 @@ java_library( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//lib:truth", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD index f2fe4c24a2..4ee81751fa 100644 --- a/java/com/google/gerrit/testing/BUILD +++ b/java/com/google/gerrit/testing/BUILD @@ -31,7 +31,6 @@ java_library( "//java/com/google/gerrit/server/schema", "//lib:gwtorm", "//lib:h2", - "//lib:truth", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", "//lib/guice", @@ -39,5 +38,6 @@ java_library( "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", "//lib/log:api", + "//lib/truth", ], ) diff --git a/java/com/google/gerrit/truth/BUILD b/java/com/google/gerrit/truth/BUILD index a0e2ee9770..9f7c1d6902 100644 --- a/java/com/google/gerrit/truth/BUILD +++ b/java/com/google/gerrit/truth/BUILD @@ -4,6 +4,6 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/acceptance/BUILD b/javatests/com/google/gerrit/acceptance/BUILD index 234e4be1fc..9246abb960 100644 --- a/javatests/com/google/gerrit/acceptance/BUILD +++ b/javatests/com/google/gerrit/acceptance/BUILD @@ -6,7 +6,7 @@ junit_tests( deps = [ "//java/com/google/gerrit/acceptance:lib", "//lib:guava", - "//lib:truth", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/acceptance/api/group/BUILD b/javatests/com/google/gerrit/acceptance/api/group/BUILD index 21294f5eec..a0b70cc810 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD @@ -21,6 +21,6 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//lib:gwtorm", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/acceptance/rest/project/BUILD b/javatests/com/google/gerrit/acceptance/rest/project/BUILD index 0720fb3961..4513e1f5ad 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD @@ -18,7 +18,7 @@ java_library( ], deps = [ "//java/com/google/gerrit/extensions:api", - "//lib:truth", + "//lib/truth", ], ) @@ -32,7 +32,7 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//lib:gwtorm", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/common/BUILD b/javatests/com/google/gerrit/common/BUILD index ff196466a8..ba9a5bccbf 100644 --- a/javatests/com/google/gerrit/common/BUILD +++ b/javatests/com/google/gerrit/common/BUILD @@ -15,7 +15,7 @@ junit_tests( "//java/com/google/gerrit/common:client", "//lib:guava", "//lib:junit", - "//lib:truth", + "//lib/truth", ], ) @@ -28,8 +28,8 @@ junit_tests( "//java/com/google/gerrit/common:version", "//java/com/google/gerrit/launcher", "//lib:guava", - "//lib:truth", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD index 70d7089eb4..a2f52298af 100644 --- a/javatests/com/google/gerrit/elasticsearch/BUILD +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -14,10 +14,10 @@ java_library( "//lib:gson", "//lib:guava", "//lib:junit", - "//lib:truth", "//lib/elasticsearch", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/extensions/BUILD b/javatests/com/google/gerrit/extensions/BUILD index 2557750ee6..069c915024 100644 --- a/javatests/com/google/gerrit/extensions/BUILD +++ b/javatests/com/google/gerrit/extensions/BUILD @@ -7,7 +7,7 @@ junit_tests( deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/common/testing:common-test-util", - "//lib:truth", "//lib/guice", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/extensions/conditions/BUILD b/javatests/com/google/gerrit/extensions/conditions/BUILD index aebe347200..e2d595113f 100644 --- a/javatests/com/google/gerrit/extensions/conditions/BUILD +++ b/javatests/com/google/gerrit/extensions/conditions/BUILD @@ -5,6 +5,6 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/extensions:lib", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/git/testing/BUILD b/javatests/com/google/gerrit/git/testing/BUILD index 13eb5bf8a5..56e9ec29c0 100644 --- a/javatests/com/google/gerrit/git/testing/BUILD +++ b/javatests/com/google/gerrit/git/testing/BUILD @@ -5,6 +5,6 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/git/testing", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD index 5cc9ae8e97..ab66f9a24d 100644 --- a/javatests/com/google/gerrit/gpg/BUILD +++ b/javatests/com/google/gerrit/gpg/BUILD @@ -20,7 +20,6 @@ junit_tests( "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:gwtorm", - "//lib:truth", "//lib/bouncycastle:bcpg", "//lib/bouncycastle:bcpg-neverlink", "//lib/bouncycastle:bcprov", @@ -30,5 +29,6 @@ junit_tests( "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", "//lib/log:api", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD index e2f2a45c13..ec2df15a71 100644 --- a/javatests/com/google/gerrit/httpd/BUILD +++ b/javatests/com/google/gerrit/httpd/BUILD @@ -19,11 +19,11 @@ junit_tests( "//lib:junit", "//lib:servlet-api-3_1-without-neverlink", "//lib:soy", - "//lib:truth", "//lib/easymock", "//lib/guice", "//lib/guice:guice-servlet", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/index/BUILD b/javatests/com/google/gerrit/index/BUILD index bd79860134..57f8feaa3e 100644 --- a/javatests/com/google/gerrit/index/BUILD +++ b/javatests/com/google/gerrit/index/BUILD @@ -10,8 +10,8 @@ junit_tests( "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/index:query_parser", "//lib:junit", - "//lib:truth", "//lib/antlr:java_runtime", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/metrics/proc/BUILD b/javatests/com/google/gerrit/metrics/proc/BUILD index 8e50cf6573..91e5cf61dc 100644 --- a/javatests/com/google/gerrit/metrics/proc/BUILD +++ b/javatests/com/google/gerrit/metrics/proc/BUILD @@ -9,8 +9,8 @@ junit_tests( "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/metrics/dropwizard", - "//lib:truth", "//lib/dropwizard:dropwizard-core", "//lib/guice", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD index af0bea6403..e4afae2699 100644 --- a/javatests/com/google/gerrit/pgm/BUILD +++ b/javatests/com/google/gerrit/pgm/BUILD @@ -13,11 +13,11 @@ junit_tests( "//java/com/google/gerrit/server", "//lib:guava", "//lib:junit", - "//lib:truth", "//lib/easymock", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/reviewdb/BUILD b/javatests/com/google/gerrit/reviewdb/BUILD index a7b9b51fef..c15acd8aa4 100644 --- a/javatests/com/google/gerrit/reviewdb/BUILD +++ b/javatests/com/google/gerrit/reviewdb/BUILD @@ -8,6 +8,6 @@ junit_tests( "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:gwtorm", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 1ab11243da..81703bfe80 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -12,7 +12,7 @@ java_library( "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/server", "//java/com/google/gerrit/truth", - "//lib:truth", + "//lib/truth", ], ) @@ -55,13 +55,13 @@ junit_tests( "//lib:guava-retrying", "//lib:gwtorm", "//lib:protobuf", - "//lib:truth-java8-extension", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", "//lib/commons:codec", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth:truth-java8-extension", "//proto:cache_java_proto", ], ) diff --git a/javatests/com/google/gerrit/server/cache/BUILD b/javatests/com/google/gerrit/server/cache/BUILD index b173957140..278330b1e4 100644 --- a/javatests/com/google/gerrit/server/cache/BUILD +++ b/javatests/com/google/gerrit/server/cache/BUILD @@ -9,8 +9,8 @@ junit_tests( "//lib:gwtorm", "//lib:junit", "//lib:protobuf", - "//lib:truth", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/cache/h2/BUILD b/javatests/com/google/gerrit/server/cache/h2/BUILD index e2b925760f..63ae94bc12 100644 --- a/javatests/com/google/gerrit/server/cache/h2/BUILD +++ b/javatests/com/google/gerrit/server/cache/h2/BUILD @@ -9,7 +9,7 @@ junit_tests( "//lib:guava", "//lib:h2", "//lib:junit", - "//lib:truth", "//lib/guice", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/group/db/BUILD b/javatests/com/google/gerrit/server/group/db/BUILD index 48e8d3034c..b364ca3535 100644 --- a/javatests/com/google/gerrit/server/group/db/BUILD +++ b/javatests/com/google/gerrit/server/group/db/BUILD @@ -17,8 +17,8 @@ junit_tests( "//java/com/google/gerrit/testing:gerrit-test-util", "//java/com/google/gerrit/truth", "//lib:gwtorm", - "//lib:truth", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/query/account/BUILD b/javatests/com/google/gerrit/server/query/account/BUILD index c352f4317a..61c82dea01 100644 --- a/javatests/com/google/gerrit/server/query/account/BUILD +++ b/javatests/com/google/gerrit/server/query/account/BUILD @@ -15,10 +15,10 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:truth", - "//lib:truth-java8-extension", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", + "//lib/truth:truth-java8-extension", "//prolog:gerrit-prolog-common", ], ) diff --git a/javatests/com/google/gerrit/server/query/change/BUILD b/javatests/com/google/gerrit/server/query/change/BUILD index 66c825ce7a..f2f8cf07f3 100644 --- a/javatests/com/google/gerrit/server/query/change/BUILD +++ b/javatests/com/google/gerrit/server/query/change/BUILD @@ -20,10 +20,10 @@ java_library( "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:gwtorm", - "//lib:truth", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) @@ -42,9 +42,9 @@ junit_tests( "//java/com/google/gerrit/server", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:gwtorm", - "//lib:truth", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/query/group/BUILD b/javatests/com/google/gerrit/server/query/group/BUILD index 01a54a3145..7fc04d8342 100644 --- a/javatests/com/google/gerrit/server/query/group/BUILD +++ b/javatests/com/google/gerrit/server/query/group/BUILD @@ -15,10 +15,10 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:truth", - "//lib:truth-java8-extension", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", + "//lib/truth:truth-java8-extension", ], ) diff --git a/javatests/com/google/gerrit/server/query/project/BUILD b/javatests/com/google/gerrit/server/query/project/BUILD index ac2692b694..3f53d2bb51 100644 --- a/javatests/com/google/gerrit/server/query/project/BUILD +++ b/javatests/com/google/gerrit/server/query/project/BUILD @@ -14,9 +14,9 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:truth", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/server/rules/BUILD b/javatests/com/google/gerrit/server/rules/BUILD index 04a6485107..42452df60d 100644 --- a/javatests/com/google/gerrit/server/rules/BUILD +++ b/javatests/com/google/gerrit/server/rules/BUILD @@ -10,10 +10,10 @@ junit_tests( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:truth", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/prolog:runtime", + "//lib/truth", "//prolog:gerrit-prolog-common", ], ) diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD index 81e8b31b87..46820c7317 100644 --- a/javatests/com/google/gerrit/server/update/BUILD +++ b/javatests/com/google/gerrit/server/update/BUILD @@ -12,9 +12,9 @@ junit_tests( "//java/com/google/gerrit/server", "//lib:guava", "//lib:junit", - "//lib:truth", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", ], ) @@ -34,10 +34,10 @@ junit_tests( "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:gwtorm", - "//lib:truth", - "//lib:truth-java8-extension", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", + "//lib/truth:truth-java8-extension", ], ) diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD index c0eaedffa3..ad7d8a9f27 100644 --- a/javatests/com/google/gerrit/sshd/BUILD +++ b/javatests/com/google/gerrit/sshd/BUILD @@ -7,7 +7,7 @@ junit_tests( "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/server", "//java/com/google/gerrit/sshd", - "//lib:truth", "//lib/mina:sshd", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/testing/BUILD b/javatests/com/google/gerrit/testing/BUILD index 191e98f5a4..5774707d0b 100644 --- a/javatests/com/google/gerrit/testing/BUILD +++ b/javatests/com/google/gerrit/testing/BUILD @@ -7,6 +7,6 @@ junit_tests( deps = [ "//java/com/google/gerrit/server", "//java/com/google/gerrit/testing:gerrit-test-util", - "//lib:truth", + "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/util/http/BUILD b/javatests/com/google/gerrit/util/http/BUILD index 5755ca847d..48b4339ad8 100644 --- a/javatests/com/google/gerrit/util/http/BUILD +++ b/javatests/com/google/gerrit/util/http/BUILD @@ -8,7 +8,7 @@ junit_tests( "//javatests/com/google/gerrit/util/http/testutil", "//lib:junit", "//lib:servlet-api-3_1-without-neverlink", - "//lib:truth", "//lib/easymock", + "//lib/truth", ], ) diff --git a/javatests/com/google/gwtexpui/safehtml/BUILD b/javatests/com/google/gwtexpui/safehtml/BUILD index 4f75bdb0bf..ed8e494af9 100644 --- a/javatests/com/google/gwtexpui/safehtml/BUILD +++ b/javatests/com/google/gwtexpui/safehtml/BUILD @@ -5,8 +5,8 @@ junit_tests( srcs = glob(["client/**/*.java"]), deps = [ "//java/com/google/gwtexpui/safehtml", - "//lib:truth", "//lib/gwt:dev", "//lib/gwt:user", + "//lib/truth", ], ) diff --git a/lib/BUILD b/lib/BUILD index 5e391e93c1..c698afbeb8 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -216,28 +216,6 @@ java_library( exports = ["@hamcrest_core//jar"], ) -java_library( - name = "truth", - data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], - visibility = ["//visibility:public"], - exports = [ - ":guava", - ":junit", - "@truth//jar", - ], -) - -java_library( - name = "truth-java8-extension", - data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], - visibility = ["//visibility:public"], - exports = [ - ":guava", - ":truth", - "@truth-java8-extension//jar", - ], -) - java_library( name = "javassist", data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], diff --git a/lib/truth/BUILD b/lib/truth/BUILD new file mode 100644 index 0000000000..c14f4f59af --- /dev/null +++ b/lib/truth/BUILD @@ -0,0 +1,21 @@ +java_library( + name = "truth", + data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], + visibility = ["//visibility:public"], + exports = [ + "//lib:guava", + "//lib:junit", + "@truth//jar", + ], +) + +java_library( + name = "truth-java8-extension", + data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"], + visibility = ["//visibility:public"], + exports = [ + ":truth", + "//lib:guava", + "@truth-java8-extension//jar", + ], +)