Skip to content

Commit

Permalink
Use the correct scala_test setup
Browse files Browse the repository at this point in the history
  • Loading branch information
meteorcloudy committed Dec 13, 2024
1 parent 34a3fba commit 1bb0773
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
13 changes: 0 additions & 13 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#
################################################################################
#
load("@io_bazel_rules_scala//testing:testing.bzl", "setup_scala_testing_toolchain")
load("@bazel_gazelle//:def.bzl", "gazelle")
load("@python_versions//3.11:defs.bzl", "compile_pip_requirements")

Expand All @@ -33,15 +32,3 @@ compile_pip_requirements(
requirements_txt = "requirements_lock.txt",
)

setup_scala_testing_toolchain(
name = "scalatest_toolchain",
scalatest_classpath = [
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scalatest_scalatest_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_flatspec_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",
"@maven//:org_scalatest_scalatest_mustmatchers_2_13",
],
)
18 changes: 10 additions & 8 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ maven.install(
"org.seleniumhq.selenium:selenium-remote-driver:4.27.0",
"org.seleniumhq.selenium:selenium-api:4.27.0",
"junit:junit:4.13.2",
"org.scalactic:scalactic_2.13:3.2.19",
"org.scalatest:scalatest_2.13:3.2.19",
"org.scalatest:scalatest-compatible:3.2.19",
"org.scalatest:scalatest-core_2.13:3.2.19",
"org.scalatest:scalatest-flatspec_2.13:3.2.19",
"org.scalatest:scalatest-matchers-core_2.13:3.2.19",
"org.scalatest:scalatest-mustmatchers_2.13:3.2.19",
],
)

Expand All @@ -65,7 +58,16 @@ use_repo(pip, "rules_webtesting_py_deps")

##### Scala dependencies #####

register_toolchains('//:scalatest_toolchain')
scala_deps = use_extension(
"@io_bazel_rules_scala//scala/extensions:deps.bzl",
"scala_deps",
)
scala_deps.settings(
fetch_sources = True,
)
scala_deps.toolchains(
scalatest = True,
)

##### Browsers dependencies #####
browser_repositories = use_extension("//web/versioned:browsers-0.3.3.bzl", "browser_repositories_extension")
Expand Down

0 comments on commit 1bb0773

Please sign in to comment.