File tree 7 files changed +16
-32
lines changed
7 files changed +16
-32
lines changed Original file line number Diff line number Diff line change @@ -33,13 +33,15 @@ http_archive(
33
33
)
34
34
35
35
# 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
+
38
40
http_archive (
39
41
name = "rules_jvm_external" ,
40
- strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG ,
41
42
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 ,
43
45
)
44
46
45
47
load ("@rules_jvm_external//:repositories.bzl" , "rules_jvm_external_deps" )
@@ -127,13 +129,3 @@ http_archive(
127
129
load ("@rules_pkg//:deps.bzl" , "rules_pkg_dependencies" )
128
130
129
131
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
-
Original file line number Diff line number Diff line change @@ -19,23 +19,15 @@ load("@com_google_protobuf//:protobuf_deps.bzl",
19
19
# PROTOBUF_MAVEN_ARTIFACTS variable so that the Bazel users can resolve their
20
20
# dependencies through maven_install.
21
21
# 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 "
24
24
http_archive (
25
25
name = "rules_jvm_external" ,
26
26
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG ,
27
27
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 ,
29
29
)
30
30
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
-
39
31
load ("@rules_jvm_external//:defs.bzl" , "maven_install" )
40
32
41
33
maven_install (
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
66
66
maven.com_google_j2objc_j2objc_annotations =com.google.j2objc:j2objc-annotations:2.8
67
67
maven.com_google_auto_value_auto_value =com.google.auto.value:auto-value:1.10.4
68
68
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
70
70
maven.org_threeten_threetenbp =org.threeten:threetenbp:1.6.8
71
71
maven.com_google_api_grpc_grpc_google_iam_v1 =com.google.api.grpc:grpc-google-iam-v1:1.21.0
72
72
maven.com_google_api_grpc_proto_google_iam_v1 =com.google.api.grpc:proto-google-iam-v1:1.21.0
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ _COMPILE_DEPS = [
20
20
"@com_google_auth_google_auth_library_oauth2_http//jar" ,
21
21
"@com_google_auth_google_auth_library_credentials//jar" ,
22
22
"@com_google_api_grpc_proto_google_common_protos//jar" ,
23
- "@maven//:com_google_api_api_common " ,
23
+ "@com_google_api_api_common//jar " ,
24
24
"@com_google_auto_value_auto_value//jar" ,
25
25
"@com_google_auto_value_auto_value_annotations//jar" ,
26
26
"@com_google_http_client_google_http_client//jar" ,
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ _COMPILE_DEPS = [
16
16
"@com_google_http_client_google_http_client//jar" ,
17
17
"@com_google_auth_google_auth_library_oauth2_http//jar" ,
18
18
"@com_google_auth_google_auth_library_credentials//jar" ,
19
- "@maven//:com_google_api_api_common " ,
19
+ "@com_google_api_api_common//jar " ,
20
20
"@com_google_auto_value_auto_value//jar" ,
21
21
"@com_google_auto_value_auto_value_annotations//jar" ,
22
22
"@javax_annotation_javax_annotation_api//jar" ,
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ _JAVA_COPTS = [
8
8
]
9
9
10
10
_COMPILE_DEPS = [
11
+ "@com_google_api_api_common//jar" ,
11
12
"@com_google_api_grpc_proto_google_common_protos//jar" ,
12
13
"@com_google_protobuf_java//jar" ,
13
14
"@com_google_auth_google_auth_library_credentials//jar" ,
@@ -26,8 +27,7 @@ _COMPILE_DEPS = [
26
27
"@com_google_code_gson_gson//jar" ,
27
28
"@com_google_guava_failureaccess//jar" ,
28
29
"@javax_annotation_javax_annotation_api//jar" ,
29
- "@org_graalvm_sdk//jar" ,
30
- "@maven//:com_google_api_api_common" ,
30
+ "@org_graalvm_sdk//jar"
31
31
]
32
32
33
33
_TEST_COMPILE_DEPS = [
Original file line number Diff line number Diff line change @@ -279,7 +279,7 @@ def java_gapic_library(
279
279
name = resource_name_name ,
280
280
srcs = ["%s-resource-name.srcjar" % srcjar_name ],
281
281
deps = [
282
- "@maven//:com_google_api_api_common " ,
282
+ "@com_google_api_api_common//jar " ,
283
283
"@com_google_guava_guava//jar" ,
284
284
"@javax_annotation_javax_annotation_api//jar" ,
285
285
],
@@ -291,7 +291,7 @@ def java_gapic_library(
291
291
"@com_google_googleapis//google/rpc:rpc_java_proto" ,
292
292
"@com_google_googleapis//google/longrunning:longrunning_java_proto" ,
293
293
"@com_google_protobuf//:protobuf_java" ,
294
- "@maven//:com_google_api_api_common " ,
294
+ "@com_google_api_api_common//jar " ,
295
295
"@com_google_api_gax_java//gax:gax" ,
296
296
"@com_google_guava_guava//jar" ,
297
297
"@com_google_code_findbugs_jsr305//jar" ,
You can’t perform that action at this time.
0 commit comments