Skip to content

Fix last_green build after disable_autoloads flip #1738

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,4 @@ use_repo(
)

bazel_dep(name = "rules_python", version = "1.4.0", dev_dependency = True)
bazel_dep(name = "rules_shell", version = "0.4.1", dev_dependency = True)
17 changes: 17 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,20 @@ load("//scala/private/extensions:dev_deps.bzl", "dev_deps_repositories")
dev_deps_repositories()

register_toolchains("//test/toolchains:java21_toolchain_definition")

http_archive(
name = "rules_shell",
sha256 = "bc61ef94facc78e20a645726f64756e5e285a045037c7a61f65af2941f4c25e1",
strip_prefix = "rules_shell-0.4.1",
url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz",
)

load(
"@rules_shell//shell:repositories.bzl",
"rules_shell_dependencies",
"rules_shell_toolchains",
)

rules_shell_dependencies()

rules_shell_toolchains()
29 changes: 28 additions & 1 deletion deps/test/BUILD.bazel.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ load(
"scalafmt_scala_test",
"scrooge_transitive_outputs_test",
)
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_scala//jmh:jmh.bzl", "scala_benchmark_jmh")
load("@rules_scala//scala/scalafmt:phase_scalafmt_ext.bzl", "ext_scalafmt")
Expand Down Expand Up @@ -89,11 +90,37 @@ default_outputs_test(
)

# From: `test/jmh/BUILD`
java_library(
name = "java_type",
srcs = ["JavaType.java"],
visibility = ["//visibility:public"],
)

scala_library(
name = "scala_type",
srcs = ["ScalaType.scala"],
visibility = ["//visibility:public"],
)

scala_library(
name = "add_numbers",
srcs = ["AddNumbers.scala"],
visibility = ["//visibility:public"],
exports = [
":java_type",
":scala_type",
],
deps = [
":java_type",
":scala_type",
],
)

scala_benchmark_jmh(
name = "test_benchmark",
srcs = ["TestBenchmark.scala"],
data = ["data.txt"],
deps = ["@rules_scala//test/jmh:add_numbers"],
deps = [":add_numbers"],
)

# From: `test/src/main/scala/scalarules/test/twitter_scrooge/BUILD`
Expand Down
3 changes: 2 additions & 1 deletion deps/test/defs.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts", "unittest")
load("@bazel_skylib//lib:collections.bzl", "collections")
load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts", "unittest")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_scala//scala:advanced_usage/scala.bzl", "make_scala_test")
load("@rules_scala//scala/scalafmt:phase_scalafmt_ext.bzl", "ext_scalafmt")

Expand Down
2 changes: 1 addition & 1 deletion examples/semanticdb/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
load("@rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
load("@rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")

scala_toolchain(
name = "semanticdb_toolchain_impl",
Expand Down
2 changes: 2 additions & 0 deletions jmh/jmh.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//scala/private:rules/scala_binary.bzl", "scala_binary")
load("//scala/private:rules/scala_library.bzl", "scala_library")

Expand Down
4 changes: 2 additions & 2 deletions jmh/toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
load("//scala:providers.bzl", "declare_deps_provider", _DepsInfo = "DepsInfo")
load(
"//scala:scala_cross_version.bzl",
_versioned_repositories = "repositories",
)
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")

DEP_PROVIDERS = [
"jmh_classpath",
Expand Down
2 changes: 1 addition & 1 deletion manual_test/scala_test_jacocorunner/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("//scala:scala.bzl", "scala_test")
load("//scala:scala_toolchain.bzl", "scala_toolchain")

scala_toolchain(
name = "passing_toolchain_impl",
Expand Down
2 changes: 1 addition & 1 deletion manual_test/scala_test_jvm_flags/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("//scala:scala.bzl", "scala_test")
load("//scala:scala_toolchain.bzl", "scala_toolchain")

scala_toolchain(
name = "failing_toolchain_impl",
Expand Down
2 changes: 1 addition & 1 deletion manual_test/scalac_jvm_opts/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("//scala:scala.bzl", "scala_library")
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("//scala_proto:scala_proto.bzl", "scala_proto_library")

scala_toolchain(
Expand Down
4 changes: 2 additions & 2 deletions protoc/private/protoc_toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
Provides precompiled protocol compiler toolchains.
"""

load("@com_google_protobuf//:protobuf_version.bzl", "PROTOC_VERSION")
load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS")
load(":private/protoc_integrity.bzl", "PROTOC_BUILDS", "PROTOC_DOWNLOAD_URL")
load(
":private/toolchain_impl.bzl",
"PROTOC_TOOLCHAIN_ENABLED",
"PROTOC_TOOLCHAIN_TYPE",
)
load("@com_google_protobuf//:protobuf_version.bzl", "PROTOC_VERSION")
load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS")

def _default_platform():
host_platform = sorted(HOST_CONSTRAINTS)
Expand Down
4 changes: 2 additions & 2 deletions scala/BUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("//scala:scala_cross_version.bzl", "version_suffix")
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("@rules_java//java:defs.bzl", "java_import", "java_library")
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
load("//scala:scala_cross_version.bzl", "version_suffix")
load("//scala:scala_toolchain.bzl", "scala_toolchain")

toolchain_type(
name = "toolchain_type",
Expand Down
10 changes: 5 additions & 5 deletions scala/extensions/config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ Provides the `scala_config` module extension with the `settings` tag class.
See the `_settings_attrs` dict for documentation.
"""

load(
"//scala/private:macros/bzlmod.bzl",
"root_module_tags",
"single_tag_values",
)
load(
"//:scala_config.bzl",
"DEFAULT_SCALA_VERSION",
_scala_config = "scala_config",
)
load(
"//scala/private:macros/bzlmod.bzl",
"root_module_tags",
"single_tag_values",
)

_settings_defaults = {
"scala_version": DEFAULT_SCALA_VERSION,
Expand Down
4 changes: 2 additions & 2 deletions scala/extensions/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ See the `scala/private/macros/bzlmod.bzl` docstring for a description of
the defaults, attrs, and tag class dictionaries pattern employed here.
"""

load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
load("//scala:toolchains.bzl", "scala_toolchains")
load(
"//scala/private:macros/bzlmod.bzl",
"repeated_tag_values",
"root_module_tags",
"single_tag_values",
)
load("//scala/private:toolchain_defaults.bzl", "TOOLCHAIN_DEFAULTS")
load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
load("//scala:toolchains.bzl", "scala_toolchains")

_settings_defaults = {
"maven_servers": default_maven_server_urls(),
Expand Down
3 changes: 2 additions & 1 deletion scala/private/common.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
load("@bazel_skylib//lib:paths.bzl", "paths")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//scala:jars_to_labels.bzl", "JarsToLabelsInfo")
load("//scala:plusone.bzl", "PlusOneDeps")
load("//scala:providers.bzl", "ScalaInfo")
load("@bazel_skylib//lib:paths.bzl", "paths")

def write_manifest_file(actions, output_file, main_class):
# TODO(bazel-team): I don't think this classpath is what you want
Expand Down
10 changes: 6 additions & 4 deletions scala/private/common_attributes.bzl
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
"""Shared attributes for rules"""

load(
"//scala/private:coverage_replacements_provider.bzl",
_coverage_replacements_provider = "coverage_replacements_provider",
)
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load(
"//scala:plusone.bzl",
_collect_plus_one_deps_aspect = "collect_plus_one_deps_aspect",
)
load(
"//scala/private:coverage_replacements_provider.bzl",
_coverage_replacements_provider = "coverage_replacements_provider",
)

common_attrs_for_plugin_bootstrapping = {
"srcs": attr.label_list(allow_files = [
Expand Down
2 changes: 2 additions & 0 deletions scala/private/coverage_replacements_provider.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
# duplicate providers.
#

load("@rules_java//java/common:java_info.bzl", "JavaInfo")

_CoverageReplacements = provider(
fields = {
"replacements": "hash of files to swap out",
Expand Down
6 changes: 3 additions & 3 deletions scala/private/extensions/dev_deps.bzl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""Repositories for testing rules_scala itself"""

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
load("//scala:scala_maven_import_external.bzl", "java_import_external")
load(
"//scala/private:macros/bzlmod.bzl",
"root_module_tags",
"single_tag_values",
)
load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
load("//scala:scala_maven_import_external.bzl", "java_import_external")
load("//third_party/repositories:repositories.bzl", "repositories")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

_BUILD_TOOLS_RELEASE = "5.1.0"

Expand Down
4 changes: 2 additions & 2 deletions scala/private/macros/scala_repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@rules_scala_config//:config.bzl", "SCALA_VERSIONS")
load(
"//scala:scala_cross_version.bzl",
"extract_major_version",
"extract_minor_version",
"version_suffix",
)
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@rules_scala_config//:config.bzl", "SCALA_VERSIONS")

def _dt_patched_compiler_impl(rctx):
# Need to give the file a .zip extension so rctx.extract knows what type of archive it is
Expand Down
4 changes: 2 additions & 2 deletions scala/private/macros/setup_scala_toolchain.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("//scala:scala_toolchain.bzl", "scala_toolchain")
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
load("//scala:providers.bzl", "declare_deps_provider")
load("//scala:scala_cross_version.bzl", "repositories", "version_suffix")
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
load("//scala:scala_toolchain.bzl", "scala_toolchain")

def setup_scala_toolchain(
name,
Expand Down
3 changes: 2 additions & 1 deletion scala/private/macros/test/BUILD.bzlmod_test
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
"""Used by test/shell/test_bzlmod_helpers.sh to test bzlmod.bzl."""

load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
load(
"@test_tag_values//:results.bzl",
"FIRST",
"REPEATED",
"SECOND",
"THIRD",
"REPEATED",
)

sh_binary(
Expand Down
2 changes: 2 additions & 0 deletions scala/private/macros/test/MODULE.bzlmod_test
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ dev_test_ext = use_extension(
"test_ext",
dev_dependency = True,
)

bazel_dep(name = "rules_shell", version = "0.4.1")
2 changes: 1 addition & 1 deletion scala/private/phases/api.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
The phase API for rules implementation
"""

load("@bazel_skylib//lib:dicts.bzl", "dicts")
load(
"//scala:advanced_usage/providers.bzl",
_ScalaRulePhase = "ScalaRulePhase",
)
load("@bazel_skylib//lib:dicts.bzl", "dicts")

# A method to modify the built-in phase list
# - Insert new phases to the first/last position
Expand Down
2 changes: 2 additions & 0 deletions scala/private/phases/phase_collect_jars.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_java//java/common:java_info.bzl", "JavaInfo")

#
# PHASE: collect jars
#
Expand Down
3 changes: 3 additions & 0 deletions scala/private/phases/phase_compile.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")

#
# PHASE: compile
#
Expand Down
2 changes: 2 additions & 0 deletions scala/private/phases/phase_jvm_flags.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_java//java/common:java_info.bzl", "JavaInfo")

#
# PHASE: jvm flags
#
Expand Down
3 changes: 2 additions & 1 deletion scala/private/phases/phase_scalac_provider.bzl
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
load("//scala:providers.bzl", _ScalacProvider = "ScalacProvider")

#
# PHASE: scalac provider
#
# DOCUMENT THIS
#
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on")
load("//scala:providers.bzl", _ScalacProvider = "ScalacProvider")

def phase_scalac_provider(ctx, p):
toolchain_type_label = "//scala:toolchain_type"
Expand Down
5 changes: 3 additions & 2 deletions scala/private/phases/phase_semanticdb.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on")
load("//scala:semanticdb_provider.bzl", "SemanticdbInfo")
load("@bazel_skylib//lib:paths.bzl", "paths")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//scala:semanticdb_provider.bzl", "SemanticdbInfo")
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on")

def phase_semanticdb(ctx, p):
#semanticdb_bundle_in_jar feature: enables bundling the semanticdb files within the output jar.
Expand Down
2 changes: 1 addition & 1 deletion scala/private/phases/phases.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ load(
_extras_phases = "extras_phases",
_run_phases = "run_phases",
)
load("//scala/private:phases/phase_collect_exports_jars.bzl", _phase_collect_exports_jars = "phase_collect_exports_jars")
load(
"//scala/private:phases/phase_collect_jars.bzl",
_phase_collect_jars_common = "phase_collect_jars_common",
Expand All @@ -15,7 +16,6 @@ load(
_phase_collect_jars_repl = "phase_collect_jars_repl",
_phase_collect_jars_scalatest = "phase_collect_jars_scalatest",
)
load("//scala/private:phases/phase_collect_exports_jars.bzl", _phase_collect_exports_jars = "phase_collect_exports_jars")
load("//scala/private:phases/phase_collect_srcjars.bzl", _phase_collect_srcjars = "phase_collect_srcjars")
load(
"//scala/private:phases/phase_compile.bzl",
Expand Down
1 change: 1 addition & 0 deletions scala/private/rule_impls.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"""Rules for supporting the Scala language."""

load("@bazel_skylib//lib:paths.bzl", "paths")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//toolchains:toolchain_utils.bzl", "find_java_toolchain")
load(":common.bzl", "rlocationpath_from_rootpath", _collect_plugin_paths = "collect_plugin_paths")
load(":resources.bzl", _resource_paths = "paths")
Expand Down
4 changes: 3 additions & 1 deletion scala/private/rules/scala_binary.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
"""Builds Scala binaries"""

load("@bazel_skylib//lib:dicts.bzl", _dicts = "dicts")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//scala:scala_cross_version.bzl", "scala_version_transition", "toolchain_transition_attr")
load(
"//scala/private:common_attributes.bzl",
"common_attrs",
Expand All @@ -9,7 +12,6 @@ load(
"resolve_deps",
)
load("//scala/private:common_outputs.bzl", "common_outputs")
load("//scala:scala_cross_version.bzl", "scala_version_transition", "toolchain_transition_attr")
load(
"//scala/private:phases/phases.bzl",
"extras_phases",
Expand Down
Loading