Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use bind's for twitter scrooge so local repo's can override scrooge and thrift versions #84

Merged
merged 4 commits into from
Aug 10, 2016
Merged

Use bind's for twitter scrooge so local repo's can override scrooge and thrift versions #84

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c3f37c
Update test rules
ianoc-stripe Jul 28, 2016
f82800b
Fix repl test
ianoc-stripe Jul 28, 2016
f11e814
Merge branch 'master' of github.com:bazelbuild/rules_scala
ianoc-stripe Jul 28, 2016
d3823aa
Use bind's for twitter scrooge so local repo's can override scrooge v…
ianoc-stripe Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions twitter_scrooge/twitter_scrooge.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,18 @@ 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"),
sha1 = "84b86c2e082aba6e0c780b3c76281703b891a2c8",
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",
Expand Down Expand Up @@ -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,
Expand Down