Skip to content

Remove @io_bazel_rules_scala or replace with Label #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Remove @io_bazel_rules_scala or replace with Label #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions WORKSPACE
View file
Open in desktop
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,11 +42,11 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

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

scala_config(enable_compiler_dependency_tracking = True)

load("//scala:toolchains.bzl", "scala_toolchains")
load("//scala:toolchains.bzl", "scala_register_toolchains", "scala_toolchains")

scala_toolchains(
fetch_sources = True,
Expand All @@ -60,9 +60,10 @@ scala_toolchains(
register_toolchains(
"//scala:unused_dependency_checker_error_toolchain",
"//test/proto:scalapb_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
)

scala_register_toolchains()

# needed for the cross repo proto test
local_repository(
name = "proto_cross_repo_boundary",
Expand Down
10 changes: 5 additions & 5 deletions dt_patches/compiler_sources/extensions.bzl
View file
Open in desktop
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
View file
Open in desktop
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
19 changes: 11 additions & 8 deletions dt_patches/test_dt_patches/WORKSPACE
View file
Open in desktop
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,14 +61,17 @@ 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_register_toolchains",
"scala_toolchains",
)

scala_toolchains(
fetch_sources = True,
validate_scala_version = False,
)

register_toolchains(
":dt_scala_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
)
register_toolchains(":dt_scala_toolchain")

scala_register_toolchains()
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches/dummy/BUILD
View file
Open in desktop
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
View file
Open in desktop
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
19 changes: 11 additions & 8 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
View file
Open in desktop
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,15 +137,18 @@ srcjars_by_version = {
},
}

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

scala_toolchains(
fetch_sources = True,
scala_compiler_srcjars = srcjars_by_version,
validate_scala_version = False,
)

register_toolchains(
":dt_scala_toolchain",
"@io_bazel_rules_scala_toolchains//...:all",
)
register_toolchains(":dt_scala_toolchain")

scala_register_toolchains()
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches_user_srcjar/dummy/BUILD
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
14 changes: 9 additions & 5 deletions examples/crossbuild/WORKSPACE
View file
Open in desktop
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.5",
Expand All @@ -59,8 +59,12 @@ scala_config(
],
)

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

scala_toolchains(scalatest = True)

register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
scala_register_toolchains()
2 changes: 1 addition & 1 deletion examples/scala3/BUILD
View file
Open in desktop
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
14 changes: 9 additions & 5 deletions examples/scala3/WORKSPACE
View file
Open in desktop
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,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 = "3.6.3")

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

scala_toolchains(fetch_sources = True)

register_toolchains("@io_bazel_rules_scala_toolchains//...:all")
scala_register_toolchains()
6 changes: 3 additions & 3 deletions examples/semanticdb/BUILD
View file
Open in desktop
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
15 changes: 10 additions & 5 deletions examples/semanticdb/WORKSPACE
View file
Open in desktop
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,21 @@ 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_register_toolchains",
"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",
)

scala_register_toolchains()
4 changes: 2 additions & 2 deletions examples/semanticdb/aspect.bzl
View file
Open in desktop
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
View file
Open in desktop
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
Loading