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.

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

Factor test toolchain #984

Closed
wants to merge 27 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0aba00e
wip
smparkes Jan 30, 2020
c830919
wip
smparkes Jan 30, 2020
fa7265f
wip
smparkes Jan 30, 2020
052e029
cleanup
smparkes Jan 30, 2020
2263bdf
cleanup
smparkes Jan 30, 2020
236cafb
use bind to remove loader-specific labels in dependencies
smparkes Jan 30, 2020
6ef373b
simple test works; //test/... does not
smparkes Jan 30, 2020
794574b
cleanup
smparkes Jan 30, 2020
7b756bd
remove scalac provider and use toolchain resolution
smparkes Jan 30, 2020
fdddc97
put the scalac dep into the toolchain
smparkes Jan 30, 2020
f7f2fa3
Merge branch 'factor-scalac-provider' into factor-test-toolchain
smparkes Jan 30, 2020
c244161
missed these pieces
smparkes Jan 30, 2020
d68b94c
wip
smparkes Jan 30, 2020
ac43892
cleanup handling of toolchains
smparkes Jan 31, 2020
578ad8f
cleanup
smparkes Jan 31, 2020
05ed1e4
unused arguements
smparkes Jan 31, 2020
a5e38a4
lint
smparkes Jan 31, 2020
df5e833
Merge branch 'factor-toolchains' into factor-scalac-provider
smparkes Jan 31, 2020
0d8f08c
lib
smparkes Jan 31, 2020
bc577ec
Merge branch 'factor-scalac-provider' into factor-test-toolchain
smparkes Jan 31, 2020
0ab261f
Merge remote-tracking branch 'upstream/master' into bind-dependencies
smparkes Jan 31, 2020
5bedbe7
Merge branch 'bind-dependencies' into factor-toolchains
smparkes Jan 31, 2020
a4b7d3c
lint
smparkes Jan 31, 2020
d78dd2c
Merge branch 'factor-toolchains' of github.com:smparkes/rules_scala i…
smparkes Jan 31, 2020
8ec626e
Merge branch 'factor-toolchains' into factor-scalac-provider
smparkes Jan 31, 2020
e4911c2
Merge branch 'factor-scalac-provider' into factor-test-toolchain
smparkes Jan 31, 2020
f577d41
update test toochain name
smparkes Jan 31, 2020
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
Prev Previous commit
Next Next commit
missed these pieces
smparkes committed Jan 30, 2020
commit c24416183433183a026f6bd582f8c2f3b215502a
6 changes: 3 additions & 3 deletions scala/private/phases/phase_collect_jars.bzl
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ load(

def phase_collect_jars_scalatest(ctx, p):
args = struct(
base_classpath = ctx.toolchains["@io_bazel_rules_scala//scala:bootstrap_toolchain_type"].bootstrapinfo.classpath + [ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].jar],
base_classpath = ctx.toolchains["@io_bazel_rules_scala//scala:bootstrap_toolchain_type"].bootstrapinfo.classpath + [ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].testinfo.jar],
extra_runtime_deps = [
ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].reporter,
ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].runner,
ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].testinfo.reporter,
ctx.toolchains["@io_bazel_rules_scala//scala:test_toolchain_type"].testinfo.runner,
],
)
return _phase_collect_jars_default(ctx, p, args)
3 changes: 1 addition & 2 deletions scala/scala_toolchain.bzl
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ ScalaInfo = provider(
"plus_one_deps_mode",
"enable_code_coverage_aspect",
"scalac_jvm_flags",
"scala_test_jvm_flags",
"scalac",
],
)
@@ -18,7 +17,7 @@ def _scala_toolchain_impl(ctx):
plus_one_deps_mode = ctx.attr.plus_one_deps_mode,
enable_code_coverage_aspect = ctx.attr.enable_code_coverage_aspect,
scalac_jvm_flags = ctx.attr.scalac_jvm_flags,
scala_test_jvm_flags = ctx.attr.scala_test_jvm_flags,
scalac = ctx.attr.scalac,
)
toolchain = platform_common.ToolchainInfo(
scalainfo = scalainfo,