Skip to content
Permalink
Browse files
fix: [gax-java] Fix broken Bazel build (#1180)
* fix: [gax-java] Fix broken Bazel build

* fix: use autovalue v1.4

* fix: remove bazel_skylib from dependencies.properties

* fix: move bazel_skylib into repositories.bzl
  • Loading branch information
miraleung committed Sep 14, 2020
1 parent 2de22b6 commit 834c05e1d35a17f90bf8cd1b2cdce40bea451c95
Showing with 11 additions and 6 deletions.
  1. +1 −0 dependencies.properties
  2. +2 −1 gax-grpc/BUILD.bazel
  3. +3 −2 gax-httpjson/BUILD.bazel
  4. +2 −1 gax/BUILD.bazel
  5. +3 −2 repositories.bzl
@@ -45,6 +45,7 @@ maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.3.4
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2
maven.com_google_api_api_common=com.google.api:api-common:1.9.3
maven.org_threeten_threetenbp=org.threeten:threetenbp:1.4.1
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:0.13.0
@@ -1,4 +1,4 @@
load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification")
load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests")

_JAVA_COPTS = [
"-source",
@@ -21,6 +21,7 @@ _COMPILE_DEPS = [
"@com_google_api_grpc_proto_google_common_protos//jar",
"@com_google_api_api_common//jar",
"@com_google_auto_value_auto_value//jar",
"@com_google_auto_value_auto_value_annotations//jar",
"@com_google_http_client_google_http_client//jar",
"@io_grpc_grpc_java//context:context",
"@io_grpc_grpc_netty_shaded//jar",
@@ -1,4 +1,4 @@
load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification")
load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests")

_JAVA_COPTS = [
"-source",
@@ -17,6 +17,7 @@ _COMPILE_DEPS = [
"@com_google_auth_google_auth_library_credentials//jar",
"@com_google_api_api_common//jar",
"@com_google_auto_value_auto_value//jar",
"@com_google_auto_value_auto_value_annotations//jar",
"@com_google_http_client_google_http_client_jackson2//jar",
"@javax_annotation_javax_annotation_api//jar",
"//gax:gax",
@@ -27,7 +28,7 @@ _TEST_COMPILE_DEPS = [
"@org_mockito_mockito_core//jar",
"@com_google_truth_truth//jar",
"//gax:gax_testlib",
"@com_googlecode_java_diff_utils_diffutils//jar",
"@com_googlecode_java_diff_utils_diffutils//jar",
]

java_library(
@@ -1,4 +1,4 @@
load("//:gax_java.bzl", "java_tests", "google_java_format", "google_java_format_verification")
load("//:gax_java.bzl", "google_java_format", "google_java_format_verification", "java_tests")

_JAVA_COPTS = [
"-source",
@@ -12,6 +12,7 @@ _COMPILE_DEPS = [
"@com_google_auth_google_auth_library_credentials//jar",
"@com_google_auth_google_auth_library_oauth2_http//jar",
"@com_google_auto_value_auto_value//jar",
"@com_google_auto_value_auto_value_annotations//jar",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_guava_guava//jar",
"@io_opencensus_opencensus_api//jar",
@@ -64,11 +64,12 @@ def com_google_api_gax_java_repositories():
strip_prefix = "grpc-java-%s" % _grpc_version,
)

_bazel_skylib_version = "1.0.3"
_maybe(
http_archive,
name = "bazel_skylib",
strip_prefix = "bazel-skylib-0.7.0",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.7.0.zip"],
strip_prefix = "bazel-skylib-%s" % _bazel_skylib_version,
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/%s.zip" % _bazel_skylib_version],
)

_maybe(

0 comments on commit 834c05e

Please sign in to comment.