Skip to content

Refactor scripts/create_repository.py, improve efficiency and correctness, and bump Scalatest, protobuf-java, kind-projector #1642

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 20 commits into from
Nov 12, 2024
Merged

Refactor scripts/create_repository.py, improve efficiency and correctness, and bump Scalatest, protobuf-java, kind-projector #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6f3f72e
Bump to Scalatest 3.2.19, protobuf-java 4.28.3
mbland Nov 4, 2024
783c2fd
Move several functions into MavenCoordinates class
mbland Nov 4, 2024
5217a32
Extract ArtifactLabelMaker in create_repository.py
mbland Nov 4, 2024
ed87506
Elide `get_mavens_coordinates_from_json`
mbland Nov 4, 2024
be4dd12
Add third_party/repositories/scala*.bzl docstring
mbland Nov 4, 2024
e241523
Extract ArtifactResolver
mbland Nov 5, 2024
1ed8c92
Remove 'testonly' when resolving root artifacts
mbland Nov 5, 2024
9912b08
Remove kind-projector_2.11.12 special case
mbland Nov 5, 2024
8b3775b
Extract ArtifactUpdater object
mbland Nov 5, 2024
9ad67f9
Refactor create_repository.py objects
mbland Nov 5, 2024
4cd9648
Make scala-parser-combinators a root artifact
mbland Nov 5, 2024
ae60a52
Add cache to ArtifactLabelMaker
mbland Nov 5, 2024
cd3bb2a
Read the `cs fetch` JSON file only once
mbland Nov 5, 2024
005fc13
Update existing repo names, root artifact versions
mbland Nov 6, 2024
aebfc9e
Use `cs fetch --json-output-file` directly
mbland Nov 6, 2024
7a12f66
Sort the third_party/repositories/scala_* dicts
mbland Nov 6, 2024
c3c40fd
Refactor select_root_artifacts
mbland Nov 7, 2024
21da683
Restore `EXCLUDED_ARTIFACTS` mechanism
mbland Nov 7, 2024
27a2cbe
Use `SPECIAL_CASE_ARTIFACT_LABELS`
mbland Nov 7, 2024
8b2efb8
Add _remove_scala_version_suffix
mbland Nov 7, 2024
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
2 changes: 1 addition & 1 deletion jmh/jmh.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def jmh_repositories(
"io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
"io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
"io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
"io_bazel_rules_scala_org_ows2_asm_asm",
"io_bazel_rules_scala_org_ow2_asm_asm",
"io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
"io_bazel_rules_scala_org_apache_commons_commons_math3",
],
Expand Down
48 changes: 33 additions & 15 deletions scala/private/macros/scala_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,27 +178,45 @@ def rules_scala_setup(scala_compiler_srcjar = None):
)

def _artifact_ids(scala_version):
return [
"io_bazel_rules_scala_scala_library",
result = [
"io_bazel_rules_scala_scala_compiler",
"io_bazel_rules_scala_scala_reflect",
"io_bazel_rules_scala_scala_xml",
"io_bazel_rules_scala_scala_parser_combinators",
"org_scalameta_semanticdb_scalac",
] if scala_version.startswith("2") else [
"io_bazel_rules_scala_scala_asm",
"io_bazel_rules_scala_scala_compiler",
"io_bazel_rules_scala_scala_compiler_2",
"io_bazel_rules_scala_scala_interfaces",
"io_bazel_rules_scala_scala_library",
"io_bazel_rules_scala_scala_library_2",
"io_bazel_rules_scala_scala_parser_combinators",
"io_bazel_rules_scala_scala_reflect_2",
"io_bazel_rules_scala_scala_tasty_core",
"io_bazel_rules_scala_scala_xml",
"org_scala_sbt_compiler_interface",
]

if scala_version.startswith("2."):
result.extend([
"io_bazel_rules_scala_scala_reflect",
"org_scalameta_semanticdb_scalac",
])

if scala_version.startswith("2.13.") or scala_version.startswith("3."):
# Since the Scala 2.13 compiler is included in Scala 3 deps.
result.extend([
"io_github_java_diff_utils_java_diff_utils",
"net_java_dev_jna_jna",
"org_jline_jline",
])

if scala_version.startswith("3."):
result.extend([
"io_bazel_rules_scala_scala_asm",
"io_bazel_rules_scala_scala_compiler_2",
"io_bazel_rules_scala_scala_interfaces",
"io_bazel_rules_scala_scala_library_2",
"io_bazel_rules_scala_scala_reflect_2",
"io_bazel_rules_scala_scala_tasty_core",
"org_jline_jline_native",
"org_jline_jline_reader",
"org_jline_jline_terminal",
"org_jline_jline_terminal_jna",
"org_scala_sbt_compiler_interface",
"org_scala_sbt_util_interface",
])

return result

def rules_scala_toolchain_deps_repositories(
maven_servers = _default_maven_server_urls(),
overriden_artifacts = {},
Expand Down
4 changes: 2 additions & 2 deletions scala/scalafmt/scalafmt_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ _SCALAFMT_DEPS = [
"com_lihaoyi_fansi",
"com_lihaoyi_fastparse",
"com_lihaoyi_sourcecode",
"com_thesamet_scalapb_lenses",
"com_thesamet_scalapb_scalapb_runtime",
"com_typesafe_config",
"org_scala_lang_modules_scala_collection_compat",
"org_scala_lang_scalap",
Expand All @@ -47,6 +45,8 @@ _SCALAFMT_DEPS = [
"org_scalameta_scalameta",
"org_scalameta_trees",
"org_typelevel_paiges_core",
"scala_proto_rules_scalapb_lenses",
"scala_proto_rules_scalapb_runtime",
]

_SCALAFMT_DEPS_2_11 = [
Expand Down
4 changes: 2 additions & 2 deletions scala_proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ declare_deps_provider(
visibility = ["//visibility:public"],
deps = [
"@com_google_protobuf//:protobuf_java",
"@scala_proto_rules_protoc_bridge",
"@scala_proto_rules_scalapb_plugin",
"@scala_proto_rules_scalapb_compilerplugin",
"@scala_proto_rules_scalapb_protoc_bridge",
],
)

Expand Down
38 changes: 19 additions & 19 deletions scala_proto/default/default_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,37 @@
# transitive path to be used without such a facility.
#
DEFAULT_SCALAPB_COMPILE_DEPS = [
"@scala_proto_rules_scalapb_runtime",
"//scala/private/toolchain_deps:scala_library_classpath",
"@com_google_protobuf//:protobuf_java",
"@com_lihaoyi_fastparse",
"@scala_proto_rules_scalapb_lenses",
"@scala_proto_rules_scalapb_fastparse",
"//scala/private/toolchain_deps:scala_library_classpath",
"@scala_proto_rules_scalapb_runtime",
]

DEFAULT_SCALAPB_GRPC_DEPS = [
"@io_bazel_rules_scala_guava",
"@scala_proto_rules_disruptor",
"@scala_proto_rules_grpc_api",
"@scala_proto_rules_perfmark_api",
"@scala_proto_rules_scalapb_runtime_grpc",
"@scala_proto_rules_grpc_context",
"@scala_proto_rules_grpc_core",
"@scala_proto_rules_grpc_stub",
"@scala_proto_rules_grpc_protobuf",
"@scala_proto_rules_grpc_netty",
"@scala_proto_rules_grpc_context",
"@scala_proto_rules_guava",
"@scala_proto_rules_opencensus_api",
"@scala_proto_rules_opencensus_impl",
"@scala_proto_rules_disruptor",
"@scala_proto_rules_opencensus_impl_core",
"@scala_proto_rules_opencensus_contrib_grpc_metrics",
"@scala_proto_rules_google_instrumentation",
"@scala_proto_rules_grpc_protobuf",
"@scala_proto_rules_grpc_stub",
"@scala_proto_rules_instrumentation_api",
"@scala_proto_rules_netty_buffer",
"@scala_proto_rules_netty_codec",
"@scala_proto_rules_netty_codec_http",
"@scala_proto_rules_netty_codec_http2",
"@scala_proto_rules_netty_codec_socks",
"@scala_proto_rules_netty_handler",
"@scala_proto_rules_netty_buffer",
"@scala_proto_rules_netty_transport",
"@scala_proto_rules_netty_resolver",
"@scala_proto_rules_netty_common",
"@scala_proto_rules_netty_handler",
"@scala_proto_rules_netty_handler_proxy",
"@scala_proto_rules_netty_resolver",
"@scala_proto_rules_netty_transport",
"@scala_proto_rules_opencensus_api",
"@scala_proto_rules_opencensus_contrib_grpc_metrics",
"@scala_proto_rules_opencensus_impl",
"@scala_proto_rules_opencensus_impl_core",
"@scala_proto_rules_perfmark_api",
"@scala_proto_rules_scalapb_runtime_grpc",
]
42 changes: 22 additions & 20 deletions scala_proto/default/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,38 @@ def scala_proto_default_repositories(
overriden_artifacts = {}):
repositories(
for_artifact_ids = [
"scala_proto_rules_scalapb_plugin",
"scala_proto_rules_protoc_bridge",
"scala_proto_rules_scalapb_runtime",
"scala_proto_rules_scalapb_runtime_grpc",
"scala_proto_rules_scalapb_lenses",
"scala_proto_rules_scalapb_fastparse",
"scala_proto_rules_grpc_core",
"com_google_protobuf_protobuf_java",
"com_lihaoyi_fastparse",
"com_lihaoyi_sourcecode",
"io_bazel_rules_scala_guava",
"scala_proto_rules_disruptor",
"scala_proto_rules_instrumentation_api",
"scala_proto_rules_grpc_api",
"scala_proto_rules_grpc_stub",
"scala_proto_rules_grpc_protobuf",
"scala_proto_rules_grpc_netty",
"scala_proto_rules_grpc_context",
"scala_proto_rules_perfmark_api",
"scala_proto_rules_guava",
"scala_proto_rules_google_instrumentation",
"scala_proto_rules_grpc_core",
"scala_proto_rules_grpc_netty",
"scala_proto_rules_grpc_protobuf",
"scala_proto_rules_grpc_stub",
"scala_proto_rules_netty_buffer",
"scala_proto_rules_netty_codec",
"scala_proto_rules_netty_codec_http",
"scala_proto_rules_netty_codec_socks",
"scala_proto_rules_netty_codec_http2",
"scala_proto_rules_netty_handler",
"scala_proto_rules_netty_buffer",
"scala_proto_rules_netty_transport",
"scala_proto_rules_netty_resolver",
"scala_proto_rules_netty_codec_socks",
"scala_proto_rules_netty_common",
"scala_proto_rules_netty_handler",
"scala_proto_rules_netty_handler_proxy",
"scala_proto_rules_netty_resolver",
"scala_proto_rules_netty_transport",
"scala_proto_rules_opencensus_api",
"scala_proto_rules_opencensus_contrib_grpc_metrics",
"scala_proto_rules_opencensus_impl",
"scala_proto_rules_disruptor",
"scala_proto_rules_opencensus_impl_core",
"scala_proto_rules_opencensus_contrib_grpc_metrics",
"scala_proto_rules_perfmark_api",
"scala_proto_rules_scalapb_compilerplugin",
"scala_proto_rules_scalapb_lenses",
"scala_proto_rules_scalapb_protoc_bridge",
"scala_proto_rules_scalapb_runtime",
"scala_proto_rules_scalapb_runtime_grpc",
],
maven_servers = maven_servers,
fetch_sources = True,
Expand Down
10 changes: 7 additions & 3 deletions scalatest/scalatest.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ def scalatest_repositories(
repositories(
scala_version = scala_version,
for_artifact_ids = [
"io_bazel_rules_scala_scalactic",
"io_bazel_rules_scala_scalatest",
"io_bazel_rules_scala_scalatest_compatible",
"io_bazel_rules_scala_scalatest_core",
"io_bazel_rules_scala_scalatest_diagrams",
"io_bazel_rules_scala_scalatest_featurespec",
"io_bazel_rules_scala_scalatest_flatspec",
"io_bazel_rules_scala_scalatest_freespec",
"io_bazel_rules_scala_scalatest_funsuite",
"io_bazel_rules_scala_scalatest_funspec",
"io_bazel_rules_scala_scalatest_funsuite",
"io_bazel_rules_scala_scalatest_matchers_core",
"io_bazel_rules_scala_scalatest_shouldmatchers",
"io_bazel_rules_scala_scalatest_mustmatchers",
"io_bazel_rules_scala_scalactic",
"io_bazel_rules_scala_scalatest_propspec",
"io_bazel_rules_scala_scalatest_refspec",
"io_bazel_rules_scala_scalatest_shouldmatchers",
"io_bazel_rules_scala_scalatest_wordspec",
],
maven_servers = maven_servers,
fetch_sources = fetch_sources,
Expand Down
Loading