Skip to content

Simplify test_dependency_versions.sh #1758

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
Aug 5, 2025
Merged

Simplify test_dependency_versions.sh #1758

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
153 changes: 4 additions & 149 deletions deps/test/BUILD.bazel.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,156 +1,11 @@
"""Test targets to ensure dependency version compatibility.
"""Test targets to ensure dependency version compatibility."""

Copied and adapted targets from the main repo as noted.
"""
load(
":defs.bzl",
"default_outputs_test",
"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")
load("@rules_scala//scala:advanced_usage/scala.bzl", "make_scala_test")
load(
"@rules_scala//scala:scala.bzl",
"scala_binary",
"scala_doc",
"scala_junit_test",
"scala_library",
"scala_specs2_junit_test",
"scala_test",
)
load("@rules_scala//scala_proto:scala_proto.bzl", "scala_proto_library")
load("@rules_scala//thrift:thrift.bzl", "thrift_library")
load(
"@rules_scala//twitter_scrooge:twitter_scrooge.bzl",
"scrooge_java_library",
"scrooge_scala_library",
)

# From: `test/BUILD`
scala_binary(
name = "ScalaBinary",
srcs = ["ScalaBinary.scala"],
main_class = "scalarules.test.ScalaBinary",
deps = [
":HelloLib",
],
)

scala_library(
name = "HelloLib",
srcs = ["HelloLib.scala"],
)

scala_doc(
name = "ScalaDoc",
deps = [":HelloLib"],
)

# From: `examples/testing/multi_frameworks_toolchain/example/BUILD`
scala_test(
name = "scalatest_example",
srcs = ["ScalaTestExampleTest.scala"],
)
load(":defs.bzl", "scalafmt_scala_test")

scala_specs2_junit_test(
name = "specs2_example",
srcs = ["Specs2ExampleTest.scala"],
suffixes = ["Test"],
)

# Manufactured based on `docs/phase_scalafmt.md` and `test/scalafmt/BUILD`.
# Based on `docs/phase_scalafmt.md`, `test/scalafmt/BUILD`, and a copy of:
# examples/testing/multi_frameworks_toolchain/example/ScalaTestExampleTest.scala
scalafmt_scala_test(
name = "ScalafmtTest",
srcs = ["ScalaTestExampleTest.scala"],
format = True,
)

# From: `test/proto/BUILD`
proto_library(
name = "standalone_proto",
srcs = ["standalone.proto"],
)

scala_proto_library(
name = "standalone_scala_proto",
deps = [":standalone_proto"],
)

default_outputs_test(
name = "standalone_scala_proto_outs_test",
expected_outs = [
"standalone_proto_scalapb-src.jar",
"standalone_proto_scalapb.jar",
],
target_under_test = ":standalone_scala_proto",
)

# 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 = [":add_numbers"],
)

# From: `test/src/main/scala/scalarules/test/twitter_scrooge/BUILD`

thrift_library(
name = "thrift3",
srcs = ["Thrift3.thrift"],
visibility = ["//visibility:public"],
)

scrooge_scala_library(
name = "scrooge3",
visibility = ["//visibility:public"],
deps = [":thrift3"],
)

scrooge_java_library(
name = "scrooge3_java",
visibility = ["//visibility:public"],
deps = [":thrift3"],
)

scrooge_transitive_outputs_test(
name = "scrooge_test_scala",
dep = ":scrooge3",
expected_jars = ["thrift3_scrooge_scala.jar"],
)

scrooge_transitive_outputs_test(
name = "scrooge_test_java",
dep = ":scrooge3_java",
expected_jars = ["thrift3_scrooge_java.jar"],
)
22 changes: 0 additions & 22 deletions deps/test/HelloLib.scala
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions deps/test/MODULE.bazel.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
"""Bazel module template for test/shell/test_deps_versions.sh tests."""

module(
name = "rules_scala_deps_versions_test",
bazel_compatibility = [">=${bazelversion}"],
)
module(name = "rules_scala_deps_versions_test")

bazel_dep(name = "rules_scala")
local_path_override(
module_name = "rules_scala",
path = "../..",
)

bazel_dep(name = "multi_frameworks_toolchain")
local_path_override(
module_name = "multi_frameworks_toolchain",
path = "../../examples/testing/multi_frameworks_toolchain",
)

bazel_dep(name = "bazel_skylib")
single_version_override(
module_name = "bazel_skylib",
Expand Down
21 changes: 0 additions & 21 deletions deps/test/ScalaBinary.scala
View file
Open in desktop

This file was deleted.

44 changes: 2 additions & 42 deletions deps/test/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,7 @@
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")
"""Utilities required for dependency compatibility tests."""

load("@rules_scala//scala:advanced_usage/scala.bzl", "make_scala_test")
load("@rules_scala//scala/scalafmt:phase_scalafmt_ext.bzl", "ext_scalafmt")

# From //test/scalafmt:phase_scalafmt_test.bzl
scalafmt_scala_test = make_scala_test(ext_scalafmt)

# From //test/proto:default_outputs_test.bzl
def _default_outputs_test(ctx):
env = analysistest.begin(ctx)

target_under_test = analysistest.target_under_test(env)
actual_outs = [f.basename for f in target_under_test[DefaultInfo].files.to_list()]

asserts.equals(env, sorted(ctx.attr.expected_outs), sorted(actual_outs))

return analysistest.end(env)

default_outputs_test = analysistest.make(
_default_outputs_test,
attrs = {
"expected_outs": attr.string_list(),
},
)

# From
# //test/src/main/scala/scalarules/test/twitter_scrooge:twitter_scrooge_test.bzl
def _scrooge_transitive_outputs(ctx):
env = unittest.begin(ctx)

asserts.equals(
env,
sorted(ctx.attr.expected_jars),
sorted(collections.uniq([out.class_jar.basename for out in ctx.attr.dep[JavaInfo].outputs.jars])),
)

return unittest.end(env)

scrooge_transitive_outputs_test = unittest.make(
_scrooge_transitive_outputs,
attrs = {
"dep": attr.label(),
"expected_jars": attr.string_list(),
},
)
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches_user_srcjar/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/overridden_artifacts/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/scala3/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/semanticdb/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/multi_frameworks_toolchain/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local_path_override(
path = "../../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/scalatest_repositories/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/specs2_junit_repositories/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
path = "../../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../../deps/latest",
Expand Down
2 changes: 1 addition & 1 deletion examples/twitter_scrooge/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local_path_override(
path = "../..",
)

bazel_dep(name = "latest_dependencies")
bazel_dep(name = "latest_dependencies", dev_dependency = True)
local_path_override(
module_name = "latest_dependencies",
path = "../../deps/latest",
Expand Down
Loading