Skip to content

Commit 3dce462

Browse files
committed
Squashed commit of the following:
commit d3ed208 Merge: 61b3b57 cd24529 Author: Ian O'Connell <[email protected]> Date: Mon Sep 12 21:21:53 2016 -0700 Merge pull request #3 from ianoc/oscar/worker-resources Add resource support, minor cleanups commit cd24529 Author: Oscar Boykin <[email protected]> Date: Mon Sep 12 18:05:01 2016 -1000 Add resource support, minor cleanups commit 61b3b57 Merge: 9bf9087 d0d6658 Author: P. Oscar Boykin <[email protected]> Date: Mon Sep 12 16:53:40 2016 -1000 Merge pull request #2 from ianoc/oscar/javac_scala_worker Add javac support for mixed targets commit d0d6658 Author: Oscar Boykin <[email protected]> Date: Mon Sep 12 14:29:18 2016 -1000 Add javac support for mixed targets commit 9bf9087 Merge: 617885e 30b0efc Author: Ian O'Connell <[email protected]> Date: Mon Sep 12 16:25:56 2016 -0700 Merge pull request #1 from ianoc/oscar/resident-compiler Factor out ScalaCInvoker option parsing commit 30b0efc Author: Oscar Boykin <[email protected]> Date: Mon Sep 12 13:22:56 2016 -1000 address review commit b28dcd1 Author: Oscar Boykin <[email protected]> Date: Mon Sep 12 12:35:14 2016 -1000 Factor out ScalaCInvoker option parsing commit 617885e Author: Ian O Connell <[email protected]> Date: Sun Sep 11 21:43:59 2016 -0700 Adding commit 821ab21 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 19:47:11 2016 -0700 wip commit f6bebe6 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 19:38:41 2016 -0700 wip commit 4ab6810 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 19:33:02 2016 -0700 wip commit cdc4995 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 17:55:40 2016 -0700 wip commit 51b9251 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 17:45:45 2016 -0700 WIP commit e4b53aa Author: Ian O Connell <[email protected]> Date: Sun Sep 11 17:29:09 2016 -0700 WIP commit 1cc779c Author: Ian O Connell <[email protected]> Date: Sun Sep 11 17:16:05 2016 -0700 Wip commit 1f9600c Author: Ian O Connell <[email protected]> Date: Sun Sep 11 14:13:33 2016 -0700 WIP commit d2dce89 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 14:11:14 2016 -0700 Undo commit ec05677 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 14:06:17 2016 -0700 WIP commit dcf82b4 Author: Ian O Connell <[email protected]> Date: Sun Sep 11 12:19:19 2016 -0700 Some formatting so my editor is less cranky commit f11926a Author: Ian O Connell <[email protected]> Date: Sun Sep 11 12:12:29 2016 -0700 WIP -- have the jar creator code inlined commit 0a1ad35 Author: Ian O Connell <[email protected]> Date: Sat Sep 10 21:01:44 2016 -0700 wip commit 3a0c1ab Author: Ian O Connell <[email protected]> Date: Sat Sep 10 20:58:10 2016 -0700 WIP commit 15d02b1 Author: Ian O Connell <[email protected]> Date: Sat Sep 10 18:10:28 2016 -0700 Make deploy jar name easier to grep for commit d3823aa Author: Ian O Connell <[email protected]> Date: Tue Aug 9 11:40:40 2016 -0700 Use bind's for twitter scrooge so local repo's can override scrooge versions commit f11e814 Merge: f82800b 4146c9e Author: Ian O Connell <[email protected]> Date: Thu Jul 28 16:28:02 2016 -0700 Merge branch 'master' of github.com:bazelbuild/rules_scala commit f82800b Author: Ian O Connell <[email protected]> Date: Thu Jul 28 15:32:14 2016 -0700 Fix repl test commit 9c3f37c Author: Ian O Connell <[email protected]> Date: Thu Jul 28 15:30:46 2016 -0700 Update test rules
1 parent 9148441 commit 3dce462

File tree

11 files changed

+937
-333
lines changed

11 files changed

+937
-333
lines changed

WORKSPACE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,17 @@ maven_jar(
1818
name = "org_psywerx_hairyfotr__linter",
1919
artifact = scala_mvn_artifact("org.psywerx.hairyfotr:linter:0.1.13"),
2020
sha1 = "e5b3e2753d0817b622c32aedcb888bcf39e275b4")
21+
22+
23+
maven_jar(
24+
name = "guava",
25+
artifact = "com.google.guava:guava:19.0",
26+
sha1 = "659eb2d42945dea37b310d96af4e12bf83f54d14"
27+
)
28+
29+
30+
git_repository(
31+
name = "io_bazel",
32+
remote = "git://github.com/bazelbuild/bazel.git",
33+
commit = "8d9fc9aef82d82076cfea2db010a3036d871027e",
34+
)

0 commit comments

Comments
 (0)