Skip to content

Commit 19e8bf8

Browse files
morambrocopybara-github
authored andcommitted
Remove call to maven_install from tink_java_deps_init
Instead, only expose TINK_MAVEN_ARTIFACTS for consumers of Tink to use in their workspace (see https://github.com/bazelbuild/rules_jvm_external#exporting-and-consuming-artifacts-from-external-repositories). Also: * Move RBE config in Tink Java's WORKSPACE. * Move args4j maven artifact from Tink Java to examples and tools since it is only used there. * Delete examples_java_deps_init.bzl, and instead simply call `maven_install` in the WORKSPACE; remove the need for keeping a separate `examples_maven` repo. PiperOrigin-RevId: 450732939 Change-Id: I2b5614c838b9a14599b5dd3d2affea44167f3037
1 parent c790509 commit 19e8bf8

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

WORKSPACE

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
workspace(name = "tink_java")
22

3-
load("@tink_java//:tink_java_deps.bzl", "tink_java_deps")
3+
load("@tink_java//:tink_java_deps.bzl", "tink_java_deps", "TINK_MAVEN_ARTIFACTS")
4+
45
tink_java_deps()
56

67
load("@tink_java//:tink_java_deps_init.bzl", "tink_java_deps_init")
8+
79
tink_java_deps_init()
10+
11+
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
12+
13+
rbe_autoconfig(name = "rbe_default")
14+
15+
load("@rules_jvm_external//:defs.bzl", "maven_install")
16+
17+
maven_install(
18+
artifacts = TINK_MAVEN_ARTIFACTS,
19+
repositories = [
20+
"https://maven.google.com",
21+
"https://repo1.maven.org/maven2",
22+
],
23+
)

tink_java_deps.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
44

55
TINK_MAVEN_ARTIFACTS = [
6-
# Placeholder for args4j:args4j:2.33. Please ignore.
76
# Placeholder for com.amazonaws:aws-java-sdk-core:1.12.182. Please ignore.
87
# Placeholder for com.amazonaws:aws-java-sdk-kms:1.12.182. Please ignore.
98
"com.google.auto:auto-common:1.2.1",

tink_java_deps_init.bzl

-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
"""Initialization of dependencies of Java Tink."""
22

33
load("@com_google_protobuf//:protobuf_deps.bzl", javalite_protobuf_deps = "protobuf_deps")
4-
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
5-
load("@rules_jvm_external//:defs.bzl", "maven_install")
64
load("@build_bazel_rules_android//android:rules.bzl", "android_sdk_repository")
7-
load("@tink_java//:tink_java_deps.bzl", "TINK_MAVEN_ARTIFACTS")
85

96
def tink_java_deps_init():
107
"""Initializes dependencies of Java Tink."""
118
javalite_protobuf_deps()
12-
rbe_autoconfig(name = "rbe_default")
139

14-
maven_install(
15-
artifacts = TINK_MAVEN_ARTIFACTS,
16-
repositories = [
17-
"https://maven.google.com",
18-
"https://repo1.maven.org/maven2",
19-
],
20-
)
2110
android_sdk_repository(
2211
name = "androidsdk",
2312
# Tink uses some APIs that only supported at this level.

0 commit comments

Comments
 (0)