Skip to content

Commit

Permalink
Remove @io_bazel_rules_scala or replace with Label
Browse files Browse the repository at this point in the history
Changes `io_bazel_rules_scala` to `rules_scala` and
`io_bazel_rules_scala_toolchains` to `rules_scala_toolchains` throughout
the repo.

`WORKSPACE` users can still import `rules_scala` as
`io_bazel_rules_scala` via `http_archive`. Bzlmod users can call
`bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala")`.
However, it's no longer required by `rules_scala` itself.

The build succeeds because `@io_bazel_rules_scala` isn't used internally
any longer. (`@io_bazel_rules_scala_toolchains` was only introduced
during Bzlmodification, so it was less fragile to begin with.)

Leaves `@io_bazel_rules_scala_config` as is for now, because it's a
documented public interface. It can be easily changed and documented in
a future commit if desired.

Also doesn't change the `io_bazel_rules_scala_` prefix for Maven
artifact repos. This could also be done and documented in a future
commit if desired.
  • Loading branch information
mbland committed Jan 28, 2025
1 parent 917fd53 commit f5d53ea
Show file tree
Hide file tree
Showing 128 changed files with 345 additions and 367 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
workspace(name = "io_bazel_rules_scala")
workspace(name = "rules_scala")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//scala:deps.bzl", "rules_scala_dependencies")
Expand Down Expand Up @@ -42,7 +42,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(enable_compiler_dependency_tracking = True)

Expand All @@ -60,7 +60,7 @@ scala_toolchains(
register_toolchains(
"//scala:unused_dependency_checker_error_toolchain",
"//test/proto:scalapb_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
"@rules_scala_toolchains//...:all",
)

# needed for the cross repo proto test
Expand Down
10 changes: 5 additions & 5 deletions dt_patches/compiler_sources/extensions.bzl
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
load(
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
"@rules_scala//scala:scala_cross_version.bzl",
"default_maven_server_urls",
)
load(
"@io_bazel_rules_scala//scala:scala_maven_import_external.bzl",
"@rules_scala//scala:scala_maven_import_external.bzl",
"scala_maven_import_external",
)
load(
"@io_bazel_rules_scala//third_party/repositories:scala_2_13.bzl",
"@rules_scala//third_party/repositories:scala_2_13.bzl",
_scala_2_version = "scala_version",
)
load(
"@io_bazel_rules_scala//third_party/repositories:scala_3_5.bzl",
"@rules_scala//third_party/repositories:scala_3_5.bzl",
_scala_3_version = "scala_version",
)
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")

_IS_SCALA_2 = SCALA_VERSION.startswith("2.")
_IS_SCALA_3 = SCALA_VERSION.startswith("3.")
Expand Down
6 changes: 3 additions & 3 deletions dt_patches/test_dt_patches/BUILD
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
load("@rules_scala//scala:scala.bzl", "setup_scala_toolchain")
load(
"@io_bazel_rules_scala//scala:scala.bzl",
"setup_scala_toolchain",
"@rules_scala//scala:scala_cross_version_select.bzl",
"select_for_scala_version",
)
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")

SCALA_LIBS = ["@scala_library"] + select_for_scala_version(
any_2 = ["@scala_reflect"],
Expand Down
10 changes: 5 additions & 5 deletions dt_patches/test_dt_patches/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "test_dt_patches")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(enable_compiler_dependency_tracking = True)

Expand All @@ -61,7 +61,7 @@ load("@compiler_sources//:extensions.bzl", "import_compiler_source_repos")

import_compiler_source_repos()

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(
fetch_sources = True,
Expand All @@ -70,5 +70,5 @@ scala_toolchains(

register_toolchains(
":dt_scala_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
"@rules_scala_toolchains//...:all",
)
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches/dummy/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_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "dummy",
Expand Down
7 changes: 5 additions & 2 deletions dt_patches/test_dt_patches_user_srcjar/BUILD
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
load(
"@io_bazel_rules_scala//scala:scala.bzl",
"@rules_scala//scala:scala.bzl",
"setup_scala_toolchain",
)
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
load(
"@rules_scala//scala:scala_cross_version_select.bzl",
"select_for_scala_version",
)

SCALA_LIBS = ["@scala_library"] + select_for_scala_version(
any_2 = ["@scala_reflect"],
Expand Down
10 changes: 5 additions & 5 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "test_dt_patches")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(enable_compiler_dependency_tracking = True)

Expand Down Expand Up @@ -137,7 +137,7 @@ srcjars_by_version = {
},
}

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(
fetch_sources = True,
Expand All @@ -147,5 +147,5 @@ scala_toolchains(

register_toolchains(
":dt_scala_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
"@rules_scala_toolchains//...:all",
)
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches_user_srcjar/dummy/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_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "dummy",
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/1_single/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")

# Here we demonstrate the simplest case,
# single binary, test or library for which we set a specific version or use the default one:
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/2_deps/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")

# Here we demonstrate how scala_version is propagated through deps.

Expand Down
4 changes: 2 additions & 2 deletions examples/crossbuild/3_select/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@io_bazel_rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@rules_scala//scala:scala_cross_version_select.bzl", "select_for_scala_version")

# Here we demonstrate how to provide distinct source files depending on the version requested

Expand Down
10 changes: 5 additions & 5 deletions examples/crossbuild/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "cross_build")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,7 +48,7 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(
scala_version = "3.3.4",
Expand All @@ -59,8 +59,8 @@ scala_config(
],
)

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(scalatest = True)

register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
register_toolchains("@rules_scala_toolchains//...:all")
2 changes: 1 addition & 1 deletion examples/scala3/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")

scala_library(
name = "lib",
Expand Down
10 changes: 5 additions & 5 deletions examples/scala3/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "specs2_junit_repositories")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,12 +48,12 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(scala_version = "3.6.3")

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(fetch_sources = True)

register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
register_toolchains("@rules_scala_toolchains//...:all")
6 changes: 3 additions & 3 deletions examples/semanticdb/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")

scala_toolchain(
name = "semanticdb_toolchain_impl",
Expand All @@ -11,7 +11,7 @@ scala_toolchain(
toolchain(
name = "semanticdb_toolchain",
toolchain = "semanticdb_toolchain_impl",
toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
toolchain_type = "@rules_scala//scala:toolchain_type",
visibility = ["//visibility:public"],
)

Expand Down
10 changes: 5 additions & 5 deletions examples/semanticdb/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "specs2_junit_repositories")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,16 +48,16 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config(scala_version = "2.13.15")

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(fetch_sources = True)

register_toolchains(
#Register and use the custom toolchain that has semanticdb enabled
"//:semanticdb_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
"@rules_scala_toolchains//...:all",
)
4 changes: 2 additions & 2 deletions examples/semanticdb/aspect.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#This aspect is an example of exposing semanticdb information for each target into a json file.
# An IDE could use a json file like this to consume the semanticdb data for each target.

load("@io_bazel_rules_scala//scala:semanticdb_provider.bzl", "SemanticdbInfo")
load("@rules_scala//scala:semanticdb_provider.bzl", "SemanticdbInfo")

def semanticdb_info_aspect_impl(target, ctx):
if SemanticdbInfo in target:
Expand All @@ -20,5 +20,5 @@ def semanticdb_info_aspect_impl(target, ctx):
semanticdb_info_aspect = aspect(
implementation = semanticdb_info_aspect_impl,
attr_aspects = ["deps"],
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
toolchains = ["@rules_scala//scala:toolchain_type"],
)
2 changes: 1 addition & 1 deletion examples/testing/multi_frameworks_toolchain/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"@io_bazel_rules_scala//testing:testing.bzl",
"@rules_scala//testing:testing.bzl",
"setup_scala_testing_toolchain",
)

Expand Down
10 changes: 5 additions & 5 deletions examples/testing/multi_frameworks_toolchain/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ workspace(name = "multi_frameworks_toolchain")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "io_bazel_rules_scala",
name = "rules_scala",
path = "../../..",
)

load("@io_bazel_rules_scala//scala:deps.bzl", "rules_scala_dependencies")
load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")

rules_scala_dependencies()

Expand Down Expand Up @@ -48,11 +48,11 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
load("@rules_scala//:scala_config.bzl", "scala_config")

scala_config()

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

scala_toolchains(
fetch_sources = True,
Expand All @@ -61,5 +61,5 @@ scala_toolchains(

register_toolchains(
":testing_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
"@rules_scala_toolchains//...:all",
)
2 changes: 1 addition & 1 deletion examples/testing/multi_frameworks_toolchain/example/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_specs2_junit_test", "scala_test")
load("@rules_scala//scala:scala.bzl", "scala_specs2_junit_test", "scala_test")

scala_test(
name = "scalatest_example",
Expand Down
Loading

0 comments on commit f5d53ea

Please sign in to comment.