Skip to content

Commit

Permalink
migrated to bazel_common.
Browse files Browse the repository at this point in the history
  • Loading branch information
perezd committed Nov 18, 2018
1 parent 8b17e04 commit f39a9d0
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 57 deletions.
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build --host_javacopt="-Xep:BetaApi:OFF" --javacopt="-Xep:BetaApi:OFF"
test --test_output=errors
34 changes: 8 additions & 26 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,31 +1,13 @@
workspace(name = "protopoet")

http_archive(
name = "guava",
url = "https://github.com/perezd/guava/archive/f8d89fb5f7720e20680cc8bd1fe16bb27072c5c6.zip",
strip_prefix = "guava-f8d89fb5f7720e20680cc8bd1fe16bb27072c5c6",
sha256 = "666ecd6f3522f85f83be6ef75083f199942f2e3f06b61a42e08b8fa69ed2f1e6",
)

load("@guava//:defs.bzl", "guava_src_dependencies")
guava_src_dependencies()

maven_jar(
name = "junit_jar",
artifact = "junit:junit:4.12",
)
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

bind(
name = "junit",
actual = "@junit_jar//jar",
)

maven_jar(
name = "truth_jar",
artifact = "com.google.truth:truth:0.39",
http_archive(
name = "bazel_common",
sha256 = "3656cb5b1a49be1077f13ba9e9cf79e690675870dc7edec8943aebaf7e94dd44",
strip_prefix = "bazel-common-c0a6655a70fb389dbb6473989450df0c86447ec3",
urls = ["https://github.com/google/bazel-common/archive/c0a6655a70fb389dbb6473989450df0c86447ec3.zip"],
)

bind(
name = "truth",
actual = "@truth_jar//jar",
)
load("@bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
google_common_workspace_rules()
31 changes: 16 additions & 15 deletions java/protopoet/BUILD
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
package(default_visibility = ["//visibility:public"])

java_library(
name = "release",
resource_jars = [
":libprotopoet.jar",
":libproto_writer.jar",
":libusage_monitor.jar",
":libline_wrapper.jar",
],
)

java_library(
name = "protopoet",
srcs = [
Expand Down Expand Up @@ -38,16 +28,15 @@ java_library(
deps = [
":proto_writer",
":usage_monitor",
"@guava//guava/src/com/google/common/base",
"@guava//guava/src/com/google/common/collect",
"@bazel_common//third_party/java/guava",
],
)

java_library(
name = "line_wrapper",
srcs = ["LineWrapper.java"],
deps = [
"@guava//guava/src/com/google/common/base",
"@bazel_common//third_party/java/guava",
],
)

Expand All @@ -60,7 +49,7 @@ java_library(
"UsedNameMonitor.java",
],
deps = [
"@guava//guava/src/com/google/common/collect",
"@bazel_common//third_party/java/guava",
],
)

Expand All @@ -72,6 +61,18 @@ java_library(
],
deps = [
":line_wrapper",
"@guava//guava/src/com/google/common/base",
"@bazel_common//third_party/java/guava",
],
)

# This target is used to create a combined jar of all the necessary
# subcomponents of protopoet.
java_library(
name = "release",
resource_jars = [
":libprotopoet.jar",
":libproto_writer.jar",
":libusage_monitor.jar",
":libline_wrapper.jar",
],
)
28 changes: 12 additions & 16 deletions javatests/protopoet/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ junit_tests(
srcs = ["ProtoWriterTest.java"],
deps = [
"//java/protopoet:proto_writer",
"//external:junit",
"//external:truth",
"@guava//guava/src/com/google/common/collect",
"@guava//guava/src/com/google/common/util/concurrent",
"@bazel_common//third_party/java/guava",
"@bazel_common//third_party/java/junit",
"@bazel_common//third_party/java/truth",
],
)

Expand All @@ -21,9 +20,9 @@ junit_tests(
],
deps = [
"//java/protopoet:usage_monitor",
"//external:junit",
"//external:truth",
"@guava//guava/src/com/google/common/util/concurrent",
"@bazel_common//third_party/java/guava",
"@bazel_common//third_party/java/junit",
"@bazel_common//third_party/java/truth",
],
)

Expand All @@ -49,11 +48,9 @@ junit_tests(
":expected_output",
"//java/protopoet",
"//java/protopoet:proto_writer",
"//external:junit",
"//external:truth",
"@guava//guava/src/com/google/common/collect",
"@guava//guava/src/com/google/common/io",
"@guava//guava/src/com/google/common/util/concurrent",
"@bazel_common//third_party/java/guava",
"@bazel_common//third_party/java/junit",
"@bazel_common//third_party/java/truth",
],
)

Expand All @@ -62,9 +59,8 @@ java_library(
srcs = ["ExpectedOutput.java"],
deps = [
"//java/protopoet:proto_writer",
"//external:junit",
"//external:truth",
"@guava//guava/src/com/google/common/util/concurrent",
"@guava//guava/src/com/google/common/io",
"@bazel_common//third_party/java/guava",
"@bazel_common//third_party/java/junit",
"@bazel_common//third_party/java/truth",
],
)

0 comments on commit f39a9d0

Please sign in to comment.