Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bazel: Support maven_install #6553

Merged
merged 3 commits into from
Dec 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,8 +1,35 @@
workspace(name = "io_grpc_grpc_java")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_jvm_external",
sha256 = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a",
strip_prefix = "rules_jvm_external-3.0",
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.0.zip",
)

load("@rules_jvm_external//:defs.bzl", "maven_install")
load("//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
load("//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")

maven_install(
artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
generate_compat_repositories = True,
override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS,
repositories = [
"https://repo.maven.apache.org/maven2/",
],
)

load("@maven//:compat.bzl", "compat_repositories")

compat_repositories()

load("//:repositories.bzl", "grpc_java_repositories")

grpc_java_repositories()

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()
2 changes: 1 addition & 1 deletion buildscripts/kokoro/bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -exu -o pipefail
cat /VERSION

use_bazel.sh 0.28.1
use_bazel.sh 1.0.1
bazel version

cd github/grpc-java
Expand Down
8 changes: 4 additions & 4 deletions examples/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ java_library(
":helloworld_java_proto",
":route_guide_java_grpc",
":route_guide_java_proto",
"@com_google_api_grpc_proto_google_common_protos//jar",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_code_gson_gson",
"@com_google_guava_guava//jar",
"@com_google_protobuf//:protobuf_java",
"@com_google_protobuf//:protobuf_java_util",
"@io_grpc_grpc_java//api",
"@io_grpc_grpc_java//protobuf",
"@io_grpc_grpc_java//stub",
"@maven//:com_google_api_grpc_proto_google_common_protos",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_code_gson_gson",
"@maven//:com_google_guava_guava",
],
)

Expand Down
47 changes: 32 additions & 15 deletions examples/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,35 +1,52 @@
workspace(name = "examples")

# For released versions, use the tagged git-repository:
# git_repository(
# For released versions, use release tag:
# http_repository(
# name = "io_grpc_grpc_java",
# remote = "https://github.com/grpc/grpc-java.git",
# tag = "<TAG>",
# sha256 = "<SHA>",
# strip_prefix = "grpc-java-<TAG>",
# url = "https://github.com/grpc/grpc-java/archive/<TAG>.zip",
# )
local_repository(
name = "io_grpc_grpc_java",
path = "..",
)

load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")


load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

maven_jar(
name = "com_google_api_grpc_cloud_pubsub_v1",
artifact = "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24",
sha1 = "601d8be0fd0cc0e050b1af3b88f191ada9a2f4e5",
http_archive(
name = "rules_jvm_external",
sha256 = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a",
strip_prefix = "rules_jvm_external-3.0",
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.0.zip",
)

maven_jar(
name = "com_google_api_grpc_proto_cloud_pubsub_v1",
artifact = "com.google.api.grpc:proto-google-cloud-pubsub-v1:0.1.24",
sha1 = "e6dd66635f674b4e380dfd3de252ae019a51a67e",
load("@rules_jvm_external//:defs.bzl", "maven_install")
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")

maven_install(
artifacts = [
"com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24",
"com.google.api.grpc:proto-google-cloud-pubsub-v1:0.1.24",
] + IO_GRPC_GRPC_JAVA_ARTIFACTS,
generate_compat_repositories = True,
override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS,
repositories = [
"https://repo.maven.apache.org/maven2/",
],
)

load("@maven//:compat.bzl", "compat_repositories")

compat_repositories()

load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")

# Run grpc_java_repositories after compat_repositories to ensure the
# maven_install-selected dependencies are used.
grpc_java_repositories()

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()
6 changes: 3 additions & 3 deletions examples/example-gauth/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ java_library(
["src/main/java/**/*.java"],
),
deps = [
"@com_google_api_grpc_cloud_pubsub_v1//jar",
"@com_google_api_grpc_proto_cloud_pubsub_v1//jar",
"@com_google_auth_google_auth_library_oauth2_http//jar",
"@io_grpc_grpc_java//api",
"@io_grpc_grpc_java//auth",
"@io_grpc_grpc_java//protobuf",
"@io_grpc_grpc_java//stub",
"@maven//:com_google_api_grpc_grpc_google_cloud_pubsub_v1",
"@maven//:com_google_api_grpc_proto_google_cloud_pubsub_v1",
"@maven//:com_google_auth_google_auth_library_oauth2_http",
],
)

Expand Down
4 changes: 2 additions & 2 deletions examples/example-tls/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ java_library(
["src/main/java/**/*.java"],
),
runtime_deps = [
"@io_netty_netty_tcnative_boringssl_static//jar",
"@maven//:io_netty_netty_tcnative_boringssl_static",
],
deps = [
":helloworld_java_grpc",
Expand All @@ -33,7 +33,7 @@ java_library(
"@io_grpc_grpc_java//netty",
"@io_grpc_grpc_java//protobuf",
"@io_grpc_grpc_java//stub",
"@io_netty_netty_handler//jar",
"@maven//:io_netty_netty_handler",
],
)

Expand Down
2 changes: 1 addition & 1 deletion netty/shaded/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ java_library(
runtime_deps = [
"//netty",
"@io_netty_netty_tcnative_boringssl_static//jar",
"@io_netty_netty_transport_native_epoll//jar",
"@io_netty_netty_transport_native_epoll_linux_x86_64//jar",
],
)
1 change: 0 additions & 1 deletion protobuf/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ java_library(
"@com_google_guava_guava//jar",
"@com_google_j2objc_j2objc_annotations//jar",
"@com_google_protobuf//:protobuf_java",
"@com_google_protobuf//:protobuf_java_util",
],
)