Skip to content

Commit

Permalink
Use incompatible_use_toolchain_transition in all rules which depend o…
Browse files Browse the repository at this point in the history
…n toolchains (#1164)
  • Loading branch information
Vaidas Pilkauskas authored Dec 9, 2020
1 parent f2ed38e commit 332a986
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/toolchain_development.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ my_toolchain_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//my_rules/toolchain:my_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
```

Expand Down Expand Up @@ -159,5 +160,6 @@ my_toolchain_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//my_rules/toolchain:my_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
```
1 change: 1 addition & 0 deletions jmh/toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ export_toolchain_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//jmh/toolchain:jmh_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions scala/plusone.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ collect_plus_one_deps_aspect = aspect(
toolchains = [
"@io_bazel_rules_scala//scala:toolchain_type",
],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions scala/private/coverage_replacements_provider.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ _aspect = aspect(
attr_aspects = _dependency_attributes,
implementation = _aspect_impl,
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
)

coverage_replacements_provider = struct(
Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def make_scala_binary(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_binary_impl,
)

Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_junit_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def make_scala_junit_test(*extras):
),
test = True,
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_junit_test_impl,
)

Expand Down
3 changes: 3 additions & 0 deletions scala/private/rules/scala_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def make_scala_library(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_library_impl,
)

Expand Down Expand Up @@ -181,6 +182,7 @@ def make_scala_library_for_plugin_bootstrapping(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_library_for_plugin_bootstrapping_impl,
)

Expand Down Expand Up @@ -247,6 +249,7 @@ def make_scala_macro_library(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_macro_library_impl,
)

Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_repl.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def make_scala_repl(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_repl_impl,
)

Expand Down
1 change: 1 addition & 0 deletions scala/private/rules/scala_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def make_scala_test(*extras):
),
test = True,
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
incompatible_use_toolchain_transition = True,
implementation = _scala_test_impl,
)

Expand Down
1 change: 1 addition & 0 deletions scala/private/toolchain_deps/toolchain_dep_rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ common_toolchain_deps = rule(
"deps_id": attr.string(mandatory = True),
},
toolchains = [_toolchain_type],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions scala/scalafmt/toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ export_scalafmt_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//scala/scalafmt/toolchain:scalafmt_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions testing/toolchain/toolchain_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ testing_toolchain_deps = rule(
"deps_id": attr.string(mandatory = True),
},
toolchains = [_toolchain_type],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions tut_rule/toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ export_tut_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//tut_rule/toolchain:tut_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
1 change: 1 addition & 0 deletions twitter_scrooge/toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ export_scrooge_deps = rule(
),
},
toolchains = ["@io_bazel_rules_scala//twitter_scrooge/toolchain:scrooge_toolchain_type"],
incompatible_use_toolchain_transition = True,
)
3 changes: 3 additions & 0 deletions twitter_scrooge/twitter_scrooge.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ scrooge_scala_aspect = aspect(
"@io_bazel_rules_scala//scala:toolchain_type",
"@io_bazel_rules_scala//twitter_scrooge/toolchain:scrooge_toolchain_type",
],
incompatible_use_toolchain_transition = True,
)

scrooge_java_aspect = aspect(
Expand All @@ -471,6 +472,7 @@ scrooge_java_aspect = aspect(
"@io_bazel_rules_scala//scala:toolchain_type",
"@io_bazel_rules_scala//twitter_scrooge/toolchain:scrooge_toolchain_type",
],
incompatible_use_toolchain_transition = True,
fragments = ["java"],
)

Expand Down Expand Up @@ -547,4 +549,5 @@ scrooge_scala_import = rule(
},
provides = [ThriftInfo, JavaInfo, ScroogeImport],
toolchains = ["@io_bazel_rules_scala//twitter_scrooge/toolchain:scrooge_toolchain_type"],
incompatible_use_toolchain_transition = True,
)

0 comments on commit 332a986

Please sign in to comment.