Skip to content

Commit 7774eb0

Browse files
committed
restore bazel configurations
1 parent 4635dd5 commit 7774eb0

File tree

7 files changed

+16
-32
lines changed

7 files changed

+16
-32
lines changed

WORKSPACE

+6-14
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ http_archive(
3333
)
3434

3535
# protobuf
36-
RULES_JVM_EXTERNAL_TAG = "5.3"
37-
RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
36+
RULES_JVM_EXTERNAL_TAG = "4.5"
37+
38+
RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6"
39+
3840
http_archive(
3941
name = "rules_jvm_external",
40-
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
4142
sha256 = RULES_JVM_EXTERNAL_SHA,
42-
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG)
43+
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
44+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
4345
)
4446

4547
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
@@ -127,13 +129,3 @@ http_archive(
127129
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
128130

129131
rules_pkg_dependencies()
130-
131-
maven_install(
132-
artifacts = [
133-
'com.google.api:api-common:2.15.1-SNAPSHOT'
134-
],
135-
repositories = [
136-
'm2Local',
137-
]
138-
)
139-

gax-java/WORKSPACE

+3-11
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,15 @@ load("@com_google_protobuf//:protobuf_deps.bzl",
1919
# PROTOBUF_MAVEN_ARTIFACTS variable so that the Bazel users can resolve their
2020
# dependencies through maven_install.
2121
# https://github.com/protocolbuffers/protobuf/issues/9132
22-
RULES_JVM_EXTERNAL_TAG = "5.3"
23-
RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
22+
RULES_JVM_EXTERNAL_TAG = "4.2"
23+
RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
2424
http_archive(
2525
name = "rules_jvm_external",
2626
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
2727
sha256 = RULES_JVM_EXTERNAL_SHA,
28-
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG)
28+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
2929
)
3030

31-
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
32-
33-
rules_jvm_external_deps()
34-
35-
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
36-
37-
rules_jvm_external_setup()
38-
3931
load("@rules_jvm_external//:defs.bzl", "maven_install")
4032

4133
maven_install(

gax-java/dependencies.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
6666
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
6767
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4
6868
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.4
69-
maven.com_google_api_api_common=com.google.api:api-common:2.19.0
69+
maven.com_google_api_api_common=com.google.api:api-common:2.18.0
7070
maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
7171
maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.21.0
7272
maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.21.0

gax-java/gax-grpc/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _COMPILE_DEPS = [
2020
"@com_google_auth_google_auth_library_oauth2_http//jar",
2121
"@com_google_auth_google_auth_library_credentials//jar",
2222
"@com_google_api_grpc_proto_google_common_protos//jar",
23-
"@maven//:com_google_api_api_common",
23+
"@com_google_api_api_common//jar",
2424
"@com_google_auto_value_auto_value//jar",
2525
"@com_google_auto_value_auto_value_annotations//jar",
2626
"@com_google_http_client_google_http_client//jar",

gax-java/gax-httpjson/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ _COMPILE_DEPS = [
1616
"@com_google_http_client_google_http_client//jar",
1717
"@com_google_auth_google_auth_library_oauth2_http//jar",
1818
"@com_google_auth_google_auth_library_credentials//jar",
19-
"@maven//:com_google_api_api_common",
19+
"@com_google_api_api_common//jar",
2020
"@com_google_auto_value_auto_value//jar",
2121
"@com_google_auto_value_auto_value_annotations//jar",
2222
"@javax_annotation_javax_annotation_api//jar",

gax-java/gax/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ _JAVA_COPTS = [
88
]
99

1010
_COMPILE_DEPS = [
11+
"@com_google_api_api_common//jar",
1112
"@com_google_api_grpc_proto_google_common_protos//jar",
1213
"@com_google_protobuf_java//jar",
1314
"@com_google_auth_google_auth_library_credentials//jar",
@@ -26,8 +27,7 @@ _COMPILE_DEPS = [
2627
"@com_google_code_gson_gson//jar",
2728
"@com_google_guava_failureaccess//jar",
2829
"@javax_annotation_javax_annotation_api//jar",
29-
"@org_graalvm_sdk//jar",
30-
"@maven//:com_google_api_api_common",
30+
"@org_graalvm_sdk//jar"
3131
]
3232

3333
_TEST_COMPILE_DEPS = [

rules_java_gapic/java_gapic.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def java_gapic_library(
279279
name = resource_name_name,
280280
srcs = ["%s-resource-name.srcjar" % srcjar_name],
281281
deps = [
282-
"@maven//:com_google_api_api_common",
282+
"@com_google_api_api_common//jar",
283283
"@com_google_guava_guava//jar",
284284
"@javax_annotation_javax_annotation_api//jar",
285285
],
@@ -291,7 +291,7 @@ def java_gapic_library(
291291
"@com_google_googleapis//google/rpc:rpc_java_proto",
292292
"@com_google_googleapis//google/longrunning:longrunning_java_proto",
293293
"@com_google_protobuf//:protobuf_java",
294-
"@maven//:com_google_api_api_common",
294+
"@com_google_api_api_common//jar",
295295
"@com_google_api_gax_java//gax:gax",
296296
"@com_google_guava_guava//jar",
297297
"@com_google_code_findbugs_jsr305//jar",

0 commit comments

Comments
 (0)