Skip to content
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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.6.1
7.6.2
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.9.9"
version = "3.10.1"
runner.dialect = scala213
align.openParenCallSite = false
align.openParenDefnSite = false
Expand Down
27 changes: 18 additions & 9 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module(
name = "rules_scala",
version = "7.1.2",
version = "7.1.3",
bazel_compatibility = [">=7.1.0"],
compatibility_level = 7,
)
Expand Down Expand Up @@ -30,7 +30,7 @@ SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS
bazel_dep(name = "bazel_skylib", version = "1.6.0")
single_version_override(
module_name = "bazel_skylib",
version = "1.8.1",
version = "1.8.2",
)

bazel_dep(name = "platforms", version = "0.0.9")
Expand All @@ -42,7 +42,7 @@ single_version_override(
bazel_dep(name = "rules_java", version = "7.6.0")
single_version_override(
module_name = "rules_java",
version = "8.15.2",
version = "8.16.1",
)

bazel_dep(name = "rules_proto", version = "6.0.0")
Expand All @@ -63,7 +63,7 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//protoc:0001-protobuf-19679-rm-protoc-dep.patch"],
version = "32.1",
version = "33.0",
)

# See //src/java/io/bazel/rulesscala/worker:worker_protocol_java_proto.
Expand Down Expand Up @@ -261,14 +261,23 @@ bazel_dep(
dev_dependency = True,
repo_name = "io_bazel_rules_go", # for com_github_bazelbuild_buildtools
)

# Temporary workaround until rules_go > 0.57.0 becomes available to resolve:
# https://github.com/bazel-contrib/rules_go/issues/4480
git_override(
module_name = "rules_go",
commit = "74199c92e20399b6ef46684b2c6fdd94b50a7892",
remote = "https://github.com/bazel-contrib/rules_go.git",
)

bazel_dep(name = "gazelle", version = "0.45.0", dev_dependency = True)

go_sdk = use_extension(
"@io_bazel_rules_go//go:extensions.bzl",
"go_sdk",
dev_dependency = True,
)
go_sdk.download(version = "1.25.1")
go_sdk.download(version = "1.25.3")

go_deps = use_extension(
"@gazelle//:extensions.bzl",
Expand All @@ -287,11 +296,11 @@ go_deps = use_extension(
# - https://go.dev/ref/mod#checksum-database
#
# go list -m golang.org/x/tools@latest
# curl https://sum.golang.org/lookup/golang.org/x/tools@v0.37.0
# curl https://sum.golang.org/lookup/golang.org/x/tools@v0.38.0
go_deps.module(
path = "golang.org/x/tools",
sum = "h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=",
version = "v0.37.0",
sum = "h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=",
version = "v0.38.0",
)
go_deps.module(
path = "github.com/golang/protobuf",
Expand All @@ -304,5 +313,5 @@ use_repo(
"org_golang_x_tools",
)

bazel_dep(name = "rules_python", version = "1.6.1", dev_dependency = True)
bazel_dep(name = "rules_python", version = "1.6.3", dev_dependency = True)
bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
9 changes: 5 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ host_platform_repo(name = "host_platform")
# others.
register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

# Required before `rules_java_dependencies` since `rules_java` 8.16.0.
load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
8 changes: 4 additions & 4 deletions deps/latest/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ module(
bazel_compatibility = [">=7.1.0"],
)

bazel_dep(name = "bazel_skylib", version = "1.8.1")
bazel_dep(name = "bazel_skylib", version = "1.8.2")
bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "protobuf", version = "32.0")
bazel_dep(name = "rules_java", version = "8.15.2")
bazel_dep(name = "protobuf", version = "33.0")
bazel_dep(name = "rules_java", version = "8.16.1")
bazel_dep(name = "rules_proto", version = "7.1.0")

# https://github.com/bazelbuild/bazel/pull/25681 removed
# `bazel_tools/tools/cpp/osx_cc_wrapper.sh.tpl` in the `last_green` Bazel as of
# 2025-04-08. At least `test_cross_build` breaks without this.
bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_cc", version = "0.2.10")
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions dt_patches/test_dt_patches/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion dt_patches/test_dt_patches_user_srcjar/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -194,5 +194,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/crossbuild/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/overridden_artifacts/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/overridden_artifacts/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/scala3/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/scala3/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/semanticdb/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/semanticdb/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/multi_frameworks_toolchain/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/testing/multi_frameworks_toolchain/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/scalatest_repositories/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/testing/scalatest_repositories/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/testing/specs2_junit_repositories/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)
8 changes: 4 additions & 4 deletions examples/testing/specs2_junit_repositories/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
2 changes: 1 addition & 1 deletion examples/twitter_scrooge/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "32.1",
version = "33.0",
)

bazel_dep(name = "rules_jvm_external", version = "6.7")
Expand Down
8 changes: 4 additions & 4 deletions examples/twitter_scrooge/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ host_platform_repo(name = "host_platform")

register_toolchains("@rules_scala_protoc_toolchains//...:all")

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
Expand Down
Loading