Skip to content

Commit d3823aa

Browse files
committed
Use bind's for twitter scrooge so local repo's can override scrooge versions
1 parent f11e814 commit d3823aa

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

twitter_scrooge/twitter_scrooge.bzl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@ def twitter_scrooge():
1818
sha1 = "2203b4df04943f4d52c53b9608cef60c08786ef2",
1919
server = "twitter_scrooge_maven_server",
2020
)
21+
22+
native.bind(name = 'io_bazel_rules_scala/dependency/thrift/libthrift', actual = '@libthrift//jar')
23+
2124
native.maven_jar(
2225
name = "scrooge_core",
2326
artifact = scala_mvn_artifact("com.twitter:scrooge-core:4.6.0"),
2427
sha1 = "84b86c2e082aba6e0c780b3c76281703b891a2c8",
2528
server = "twitter_scrooge_maven_server",
2629
)
2730

31+
native.bind(name = 'io_bazel_rules_scala/dependency/thrift/scrooge_core', actual = '@scrooge_core//jar')
32+
2833
#scrooge-generator related dependencies
2934
native.maven_jar(
3035
name = "scrooge_generator",
@@ -223,12 +228,12 @@ def scrooge_scala_library(name, deps=[], remote_jars=[], jvm_flags=[], visibilit
223228
name = name,
224229
deps = deps + remote_jars + [
225230
srcjar,
226-
"@libthrift//jar",
227-
"@scrooge_core//jar"
231+
"//external:io_bazel_rules_scala/dependency/thrift/libthrift",
232+
"//external:io_bazel_rules_scala/dependency/thrift/scrooge_core"
228233
],
229234
exports = deps + remote_jars + [
230-
"@libthrift//jar",
231-
"@scrooge_core//jar",
235+
"//external:io_bazel_rules_scala/dependency/thrift/libthrift",
236+
"//external:io_bazel_rules_scala/dependency/thrift/scrooge_core",
232237
],
233238
jvm_flags = jvm_flags,
234239
visibility = visibility,

0 commit comments

Comments
 (0)