From d3823aa31735bc8d1a33f9ffac4a1ed98841fee0 Mon Sep 17 00:00:00 2001 From: Ian O Connell Date: Tue, 9 Aug 2016 11:40:40 -0700 Subject: [PATCH] Use bind's for twitter scrooge so local repo's can override scrooge versions --- twitter_scrooge/twitter_scrooge.bzl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/twitter_scrooge/twitter_scrooge.bzl b/twitter_scrooge/twitter_scrooge.bzl index 2b8b47795..2ced1a8d3 100644 --- a/twitter_scrooge/twitter_scrooge.bzl +++ b/twitter_scrooge/twitter_scrooge.bzl @@ -18,6 +18,9 @@ def twitter_scrooge(): sha1 = "2203b4df04943f4d52c53b9608cef60c08786ef2", server = "twitter_scrooge_maven_server", ) + + native.bind(name = 'io_bazel_rules_scala/dependency/thrift/libthrift', actual = '@libthrift//jar') + native.maven_jar( name = "scrooge_core", artifact = scala_mvn_artifact("com.twitter:scrooge-core:4.6.0"), @@ -25,6 +28,8 @@ def twitter_scrooge(): server = "twitter_scrooge_maven_server", ) + native.bind(name = 'io_bazel_rules_scala/dependency/thrift/scrooge_core', actual = '@scrooge_core//jar') + #scrooge-generator related dependencies native.maven_jar( name = "scrooge_generator", @@ -223,12 +228,12 @@ def scrooge_scala_library(name, deps=[], remote_jars=[], jvm_flags=[], visibilit name = name, deps = deps + remote_jars + [ srcjar, - "@libthrift//jar", - "@scrooge_core//jar" + "//external:io_bazel_rules_scala/dependency/thrift/libthrift", + "//external:io_bazel_rules_scala/dependency/thrift/scrooge_core" ], exports = deps + remote_jars + [ - "@libthrift//jar", - "@scrooge_core//jar", + "//external:io_bazel_rules_scala/dependency/thrift/libthrift", + "//external:io_bazel_rules_scala/dependency/thrift/scrooge_core", ], jvm_flags = jvm_flags, visibility = visibility,