From 38455e8ca91ca3c351a6d15bd9ec25070386fc6c Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Tue, 8 Dec 2020 14:52:41 +0100 Subject: [PATCH] Fix Scala version overwrite (#8197) The old format changed and resulted in that silently being ignored. changelog_begin changelog_end --- WORKSPACE | 23 +++++++++++++++-------- compatibility/WORKSPACE | 26 ++++++++++++++++++-------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0dcc118b61..96f0840477 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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") diff --git a/compatibility/WORKSPACE b/compatibility/WORKSPACE index e7dee70389..d1cba696f9 100644 --- a/compatibility/WORKSPACE +++ b/compatibility/WORKSPACE @@ -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")