Skip to content

Commit cfd264b

Browse files
Merge pull request #21 from Tinder/testonly_deps
Move junit and mockito to testonly maven deps
2 parents e6db727 + f2c9350 commit cfd264b

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ Add the following to your `WORKSPACE` file to add the external repositories, rep
182182
)
183183

184184
load("@bazel_diff//:repositories.bzl", "bazel_diff_dependencies")
185-
load("@bazel_diff//:constants.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS")
186185

187186
bazel_diff_dependencies()
188187

189188
load("@rules_jvm_external//:defs.bzl", "maven_install")
189+
load("//:artifacts.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS")
190190

191191
maven_install(
192192
name = "bazel_diff_maven",

WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
workspace(name = "bazel_diff")
22

33
load("//:repositories.bzl", "bazel_diff_dependencies")
4-
load("//:constants.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS")
54

65
bazel_diff_dependencies()
76

@@ -11,6 +10,7 @@ rules_proto_dependencies()
1110
rules_proto_toolchains()
1211

1312
load("@rules_jvm_external//:defs.bzl", "maven_install")
13+
load("//:artifacts.bzl", "BAZEL_DIFF_MAVEN_ARTIFACTS")
1414

1515
maven_install(
1616
name = "bazel_diff_maven",

artifacts.bzl

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
""" Artifacts used to build bazel-diff """
2+
3+
load("@rules_jvm_external//:specs.bzl", "maven")
4+
5+
BAZEL_DIFF_MAVEN_ARTIFACTS = [
6+
maven.artifact("junit", "junit", "4.13", testonly = True),
7+
maven.artifact("org.mockito", "mockito-core", "3.5.15", testonly = True),
8+
"info.picocli:picocli:jar:4.3.2",
9+
"com.google.code.gson:gson:jar:2.8.6",
10+
"com.google.guava:guava:29.0-jre"
11+
]

constants.bzl

-8
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,3 @@ DEFAULT_JVM_EXTERNAL_TAG = "3.3"
77
RULES_JVM_EXTERNAL_SHA = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab"
88

99
BUILD_PROTO_MESSAGE_SHA = "50b79faec3c4154bed274371de5678b221165e38ab59c6167cc94b922d9d9152"
10-
11-
BAZEL_DIFF_MAVEN_ARTIFACTS = [
12-
"junit:junit:4.12",
13-
"org.mockito:mockito-core:3.3.3",
14-
"info.picocli:picocli:jar:4.3.2",
15-
"com.google.code.gson:gson:jar:2.8.6",
16-
"com.google.guava:guava:29.0-jre"
17-
]

repositories.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Methods to assist in loading dependencies for bazel-diff in WORKSPACE files
33
"""
44

55
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
6-
load("//:constants.bzl", "DEFAULT_JVM_EXTERNAL_TAG", "RULES_JVM_EXTERNAL_SHA", "BUILD_PROTO_MESSAGE_SHA")
6+
load("//:constants.bzl", "DEFAULT_JVM_EXTERNAL_TAG", "RULES_JVM_EXTERNAL_SHA")
77

88
def _maybe(repo_rule, name, **kwargs):
99
if not native.existing_rule(name):

test/java/com/bazel_diff/BUILD

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ java_library(
1313
"//src/main/java/com/bazel_diff:java-bazel-diff-lib",
1414
"@bazel_diff_maven//:org_mockito_mockito_core",
1515
"@bazel_diff_maven//:junit_junit"
16-
]
16+
],
17+
testonly = True
1718
)

0 commit comments

Comments
 (0)