mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 01:07:18 +03:00
Fix Scala version overwrite (#8197)
The old format changed and resulted in that silently being ignored. changelog_begin changelog_end
This commit is contained in:
parent
fdde69a599
commit
38455e8ca9
23
WORKSPACE
23
WORKSPACE
@ -707,15 +707,22 @@ load(
|
|||||||
|
|
||||||
# note some dependencies in bazel-jvm-deps.bzl (e.g. silencer_plugin) refer to the current scala version:
|
# note some dependencies in bazel-jvm-deps.bzl (e.g. silencer_plugin) refer to the current scala version:
|
||||||
scala_repositories(
|
scala_repositories(
|
||||||
(
|
|
||||||
"2.12.12",
|
|
||||||
{
|
|
||||||
"scala_compiler": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
|
|
||||||
"scala_library": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
|
|
||||||
"scala_reflect": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
fetch_sources = True,
|
fetch_sources = True,
|
||||||
|
overriden_artifacts =
|
||||||
|
{
|
||||||
|
"io_bazel_rules_scala_scala_compiler": {
|
||||||
|
"artifact": "org.scala-lang:scala-compiler:2.12.12",
|
||||||
|
"sha256": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
|
||||||
|
},
|
||||||
|
"io_bazel_rules_scala_scala_library": {
|
||||||
|
"artifact": "org.scala-lang:scala-library:2.12.12",
|
||||||
|
"sha256": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
|
||||||
|
},
|
||||||
|
"io_bazel_rules_scala_scala_reflect": {
|
||||||
|
"artifact": "org.scala-lang:scala-reflect:2.12.12",
|
||||||
|
"sha256": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
|
||||||
|
},
|
||||||
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
|
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
|
||||||
|
@ -339,14 +339,24 @@ load(
|
|||||||
"scala_repositories",
|
"scala_repositories",
|
||||||
)
|
)
|
||||||
|
|
||||||
scala_repositories((
|
scala_repositories(
|
||||||
"2.12.12",
|
fetch_sources = True,
|
||||||
{
|
overriden_artifacts =
|
||||||
"scala_compiler": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
|
{
|
||||||
"scala_library": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
|
"io_bazel_rules_scala_scala_compiler": {
|
||||||
"scala_reflect": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
|
"artifact": "org.scala-lang:scala-compiler:2.12.12",
|
||||||
},
|
"sha256": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
|
||||||
))
|
},
|
||||||
|
"io_bazel_rules_scala_scala_library": {
|
||||||
|
"artifact": "org.scala-lang:scala-library:2.12.12",
|
||||||
|
"sha256": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
|
||||||
|
},
|
||||||
|
"io_bazel_rules_scala_scala_reflect": {
|
||||||
|
"artifact": "org.scala-lang:scala-reflect:2.12.12",
|
||||||
|
"sha256": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
|
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user