Skip to content

Commit 35373d2

Browse files
committed
test/orfs: move towards bazel bcr for verilator, scala, etc.
Signed-off-by: Øyvind Harboe <[email protected]>
1 parent 5894443 commit 35373d2

File tree

3 files changed

+31
-1102
lines changed

3 files changed

+31
-1102
lines changed

MODULE.bazel

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@ bazel_dep(name = "rules_cc", version = "0.1.2")
1111
bazel_dep(name = "rules_flex", version = "0.3.1")
1212
bazel_dep(name = "rules_bison", version = "0.3.1")
1313
bazel_dep(name = "rules_jvm_external", version = "6.4")
14-
bazel_dep(name = "rules_scala")
15-
git_override(
16-
module_name = "rules_scala",
17-
commit = "1aced658083aac6c636fcc03b7cd3952a426eda7",
18-
remote = "https://github.com/bazelbuild/rules_scala",
19-
)
20-
14+
bazel_dep(name = "rules_java", version = "8.14.0")
15+
bazel_dep(name = "rules_scala", version = "7.1.5")
2116
bazel_dep(name = "rules_verilator", version = "0.1.0")
2217
bazel_dep(name = "verilator", version = "5.036.bcr.3")
2318

@@ -163,26 +158,15 @@ orfs.default(
163158
use_repo(orfs, "com_github_nixos_patchelf_download")
164159
use_repo(orfs, "docker_orfs")
165160

166-
SCALA_VERSION = "2.13.16"
167-
168-
scala_config = use_extension(
169-
"@rules_scala//scala/extensions:config.bzl",
170-
"scala_config",
171-
)
172-
scala_config.settings(
173-
scala_version = SCALA_VERSION,
174-
)
161+
# Configure BCR rules_scala
162+
scala_config = use_extension("@rules_scala//scala/extensions:config.bzl", "scala_config")
163+
scala_config.settings(scala_version = "2.13.17")
175164
use_repo(scala_config, "rules_scala_config")
176165

177-
scala_deps = use_extension(
178-
"@rules_scala//scala/extensions:deps.bzl",
179-
"scala_deps",
180-
)
181-
scala_deps.settings(
182-
fetch_sources = True,
183-
)
184-
scala_deps.scala()
185-
scala_deps.scalatest()
166+
scala_deps = use_extension("@rules_scala//scala/extensions:deps.bzl", "scala_deps")
167+
scala_deps.scala() # Provides scala-compiler, scala-library, scala-reflect
168+
scala_deps.scalatest() # Provides scalatest framework
169+
use_repo(scala_deps, "rules_scala_toolchains")
186170

187171
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
188172
maven.install(

0 commit comments

Comments
 (0)