digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Fix Scala version overwrite (#8197)

Browse Source 
The old format changed and resulted in that silently being ignored.

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2020-12-08 14:52:41 +01:00 committed by GitHub
parent fdde69a599
commit 38455e8ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WORKSPACE
View File

@ -707,15 +707,22 @@ load(
# note some dependencies in bazel-jvm-deps.bzl (e.g. silencer_plugin) refer to the current scala version:
scala_repositories(
(
"2.12.12",
{
"scala_compiler": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
"scala_library": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
"scala_reflect": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
},
),
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")

26
compatibility/WORKSPACE
View File

@ -339,14 +339,24 @@ load(
"scala_repositories",
)
scala_repositories((
"2.12.12",
{
"scala_compiler": "9dfa682ad7c2859cdcf6a31b9734c8f1ee38e7e391aeafaef91967b6ce819b6b",
"scala_library": "1673ffe8792021f704caddfe92067ed1ec75229907f84380ad68fe621358c925",
"scala_reflect": "3c502791757c0c8208f00033d8c4d778ed446efa6f49a6f89b59c6f92b347774",
},
))
scala_repositories(
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")