Skip to content

Commit

Permalink
Fix WORKSPACE in the test framework (#45)
Browse files Browse the repository at this point in the history
* maven_dependencies added to WORKSPACE

* io_bazel_rules_scala to rules_scala3

* zinc_3_3_migration to zinc_3_migration

---------

Co-authored-by: anna-skrodzka <annaskrod@h=gmail.com>
  • Loading branch information
anna-skrodzka and anna-skrodzka authored Oct 22, 2024
1 parent 72a69e7 commit 2f5461a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
10 changes: 9 additions & 1 deletion tests/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:repositories.bzl", "rules_nixpkgs_depende

rules_nixpkgs_dependencies()

load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_local_repository", "nixpkgs_cc_configure")
load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_cc_configure", "nixpkgs_local_repository")

nixpkgs_local_repository(
name = "nixpkgs",
Expand Down Expand Up @@ -108,6 +108,14 @@ load("//3rdparty:workspace.bzl", "maven_dependencies")

maven_dependencies()

load("@rules_scala3//3rdparty:workspace.bzl", "maven_dependencies")

maven_dependencies()

load("@rules_scala3//scala/3rdparty:workspace.bzl", "maven_dependencies")

maven_dependencies()

bind(
name = "default_scala",
actual = "@rules_scala3//scala:zinc_3_3",
Expand Down
2 changes: 1 addition & 1 deletion tests/compat/scalacopts/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
load("@rules_scala3//rules:scala.bzl", "scala_library")

scala_library(
name = "default",
Expand Down
4 changes: 2 additions & 2 deletions tests/grpc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ scala_library(
deps_used_whitelist = [
"@com_google_protobuf//java/core",
],
scala = "@rules_scala3//scala:zinc_3_3_migration",
scala = "@rules_scala3//scala:zinc_3_migration",
deps = [
"//3rdparty/jvm/com/thesamet/scalapb:scalapb_runtime",
"//3rdparty/jvm/com/thesamet/scalapb:scalapb_runtime_grpc",
Expand All @@ -66,7 +66,7 @@ scala_library(
deps_used_whitelist = [
"@com_google_protobuf//java/core",
],
scala = "@rules_scala3//scala:zinc_3_3_migration",
scala = "@rules_scala3//scala:zinc_3_migration",
scalacopts = [
"-scalajs",
],
Expand Down
2 changes: 1 addition & 1 deletion tests/proto/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ scala_library(
deps_unused_whitelist = [
"//3rdparty/jvm/com/google/protobuf:protobuf_java",
],
scala = "@rules_scala3//scala:zinc_3_3_migration",
scala = "@rules_scala3//scala:zinc_3_migration",
deps = [
"//3rdparty/jvm/com/thesamet/scalapb:scalapb_runtime",
],
Expand Down

0 comments on commit 2f5461a

Please sign in to comment.