diff --git a/.bazelrc b/.bazelrc index 498871943..4993b2992 100644 --- a/.bazelrc +++ b/.bazelrc @@ -6,4 +6,4 @@ build:windows --worker_quit_after_build --enable_runfiles # Remove upon completing Bzlmod compatibility work. # - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +common --noenable_bzlmod --enable_workspace diff --git a/.bazelversion b/.bazelversion index f22d756da..18bb4182d 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/WORKSPACE b/WORKSPACE index 803510ba8..3398c22d0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,7 +5,7 @@ load("//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -15,9 +15,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -28,6 +28,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/dt_patches/compiler_sources/.bazelversion b/dt_patches/compiler_sources/.bazelversion index f22d756da..18bb4182d 100644 --- a/dt_patches/compiler_sources/.bazelversion +++ b/dt_patches/compiler_sources/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/dt_patches/test_dt_patches/.bazelversion b/dt_patches/test_dt_patches/.bazelversion index f22d756da..18bb4182d 100644 --- a/dt_patches/test_dt_patches/.bazelversion +++ b/dt_patches/test_dt_patches/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/dt_patches/test_dt_patches/WORKSPACE b/dt_patches/test_dt_patches/WORKSPACE index 9363e4857..ea763d0aa 100644 --- a/dt_patches/test_dt_patches/WORKSPACE +++ b/dt_patches/test_dt_patches/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/dt_patches/test_dt_patches_user_srcjar/.bazelversion b/dt_patches/test_dt_patches_user_srcjar/.bazelversion index f22d756da..18bb4182d 100644 --- a/dt_patches/test_dt_patches_user_srcjar/.bazelversion +++ b/dt_patches/test_dt_patches_user_srcjar/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 3edf41990..48f9a6a10 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/crossbuild/.bazelversion b/examples/crossbuild/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/crossbuild/.bazelversion +++ b/examples/crossbuild/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 6559dcd2c..b09925c5d 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/scala3/.bazelversion b/examples/scala3/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/scala3/.bazelversion +++ b/examples/scala3/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index b23873f56..5a2de0f4e 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/semanticdb/.bazelversion b/examples/semanticdb/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/semanticdb/.bazelversion +++ b/examples/semanticdb/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 28b1900ef..555370a6b 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/testing/multi_frameworks_toolchain/.bazelversion b/examples/testing/multi_frameworks_toolchain/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/testing/multi_frameworks_toolchain/.bazelversion +++ b/examples/testing/multi_frameworks_toolchain/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/testing/multi_frameworks_toolchain/WORKSPACE b/examples/testing/multi_frameworks_toolchain/WORKSPACE index 5afa9d5e8..53906e3b2 100644 --- a/examples/testing/multi_frameworks_toolchain/WORKSPACE +++ b/examples/testing/multi_frameworks_toolchain/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/testing/scalatest_repositories/.bazelversion b/examples/testing/scalatest_repositories/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/testing/scalatest_repositories/.bazelversion +++ b/examples/testing/scalatest_repositories/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/testing/scalatest_repositories/WORKSPACE b/examples/testing/scalatest_repositories/WORKSPACE index 9257c234a..0e1dfd128 100644 --- a/examples/testing/scalatest_repositories/WORKSPACE +++ b/examples/testing/scalatest_repositories/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/examples/testing/specs2_junit_repositories/.bazelversion b/examples/testing/specs2_junit_repositories/.bazelversion index f22d756da..18bb4182d 100644 --- a/examples/testing/specs2_junit_repositories/.bazelversion +++ b/examples/testing/specs2_junit_repositories/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/examples/testing/specs2_junit_repositories/WORKSPACE b/examples/testing/specs2_junit_repositories/WORKSPACE index 886f0fbd7..cea461342 100644 --- a/examples/testing/specs2_junit_repositories/WORKSPACE +++ b/examples/testing/specs2_junit_repositories/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/scala/deps.bzl b/scala/deps.bzl index c41687cc8..e8b769d86 100644 --- a/scala/deps.bzl +++ b/scala/deps.bzl @@ -18,41 +18,41 @@ def rules_scala_dependencies(): maybe( http_archive, name = "rules_cc", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"], - sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf", - strip_prefix = "rules_cc-0.0.9", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz"], + sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1", + strip_prefix = "rules_cc-0.0.17", ) - # Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14. maybe( http_archive, - name = "com_google_absl", - sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8", - strip_prefix = "abseil-cpp-20220623.1", - url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz", + name = "abseil-cpp", + sha256 = "16242f394245627e508ec6bb296b433c90f8d914f73b9c026fddb905e27276e8", + strip_prefix = "abseil-cpp-20250127.0", + url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.0.tar.gz", ) maybe( http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/7.12.4/rules_java-7.12.4.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/8.8.0/rules_java-8.8.0.tar.gz", ], - sha256 = "302bcd9592377bf9befc8e41aa97ec02df12813d47af9979e4764f3ffdcc5da8", + sha256 = "f79a6e10cdd213ceded45884914bb8c68f0c8d41144e74ec89ebb74984c409ac", ) maybe( http_archive, name = "com_google_protobuf", - sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae", - strip_prefix = "protobuf-21.7", - url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz", + sha256 = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e", + strip_prefix = "protobuf-29.3", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.3.tar.gz", + repo_mapping = {"@com_google_absl": "@abseil-cpp"}, ) maybe( http_archive, name = "rules_proto", - sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295", - strip_prefix = "rules_proto-6.0.2", - url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz", + sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", + strip_prefix = "rules_proto-7.1.0", + url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz", ) diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 25754a28f..8d41584af 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -33,7 +33,7 @@ KIND_PROJECTOR_VERSION = "0.13.3" PROTOBUF_JAVA_VERSION = "4.29.3" JLINE_VERSION = '3.29.0' -SCALAPB_VERSION = '0.11.17' +SCALAPB_VERSION = '1.0.0-alpha.1' PROTOC_BRIDGE_VERSION = '0.9.8' GRPC_VERSION = '1.70.0' GRPC_COMMON_PROTOS_VERSION = '2.52.0' diff --git a/src/java/io/bazel/rulesscala/scalac/reporter/BUILD b/src/java/io/bazel/rulesscala/scalac/reporter/BUILD index 210b6c5d4..70d180364 100644 --- a/src/java/io/bazel/rulesscala/scalac/reporter/BUILD +++ b/src/java/io/bazel/rulesscala/scalac/reporter/BUILD @@ -1,4 +1,7 @@ -load("@rules_java//java:defs.bzl", "java_library", "java_proto_library") +load( + "@com_google_protobuf//bazel:java_proto_library.bzl", + "java_proto_library", +) load("@rules_proto//proto:defs.bzl", "proto_library") load("//scala:scala_cross_version_select.bzl", "select_for_scala_version") diff --git a/src/protobuf/io/bazel/rules_scala/BUILD b/src/protobuf/io/bazel/rules_scala/BUILD index 438db80a9..4bd043883 100644 --- a/src/protobuf/io/bazel/rules_scala/BUILD +++ b/src/protobuf/io/bazel/rules_scala/BUILD @@ -1,5 +1,8 @@ +load( + "@com_google_protobuf//bazel:java_proto_library.bzl", + "java_proto_library", +) load("@rules_proto//proto:defs.bzl", "proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") proto_library( name = "diagnostics_proto", diff --git a/test/proto_cross_repo_boundary/repo/.bazelversion b/test/proto_cross_repo_boundary/repo/.bazelversion index f22d756da..18bb4182d 100644 --- a/test/proto_cross_repo_boundary/repo/.bazelversion +++ b/test/proto_cross_repo_boundary/repo/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/test/semanticdb/BUILD b/test/semanticdb/BUILD index 37e3ec0e8..076c8e214 100644 --- a/test/semanticdb/BUILD +++ b/test/semanticdb/BUILD @@ -57,5 +57,6 @@ scala_library( "*.scala", "tempsrc/*.scala", #Include src files that are dynamically generated by the test_semanticdb.sh (tmpsrc should be in .gitignore so its contents don't get checked in) ], + allow_empty = True, ), ) diff --git a/test_cross_build/.bazelversion b/test_cross_build/.bazelversion index f22d756da..18bb4182d 100644 --- a/test_cross_build/.bazelversion +++ b/test_cross_build/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index 7a4766e3f..1bba2bfce 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh index 6d9d46ebd..e56be4da5 100755 --- a/test_thirdparty_version.sh +++ b/test_thirdparty_version.sh @@ -20,7 +20,6 @@ $runner test_scala_version "3.3.5" # Latest LTS version $runner test_scala_version "3.1.3" # First supported major for Scala 3, max supported JDK=18 $runner test_scala_version "2.13.15" $runner test_scala_version "2.12.20" -$runner test_scala_version "2.11.12" # Tests for other versions should be placed in dangerous_test_thirdparty_version.sh # However that script is outdated and uses only default Scala version for each minor diff --git a/test_version.sh b/test_version.sh index f88fd3e43..5617a3139 100755 --- a/test_version.sh +++ b/test_version.sh @@ -2,12 +2,11 @@ set -e -scala_2_11_version="2.11.12" scala_2_12_version="2.12.20" scala_2_13_version="2.13.15" scala_3_version="3.3.5" -SCALA_VERSION_DEFAULT=$scala_2_11_version +SCALA_VERSION_DEFAULT=$scala_2_12_version diagnostics_reporter_toolchain="//:diagnostics_reporter_toolchain" diagnostics_reporter_and_semanticdb_toolchain="//:diagnostics_reporter_and_semanticdb_toolchain" @@ -117,24 +116,20 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) runner=$(get_test_runner "${1:-local}") export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/.bazelversion)} -TEST_TIMEOUT=15 $runner test_scala_version "${scala_2_11_version}" TEST_TIMEOUT=15 $runner test_scala_version "${scala_2_12_version}" TEST_TIMEOUT=15 $runner test_scala_version "${scala_2_13_version}" TEST_TIMEOUT=15 $runner test_twitter_scrooge_versions "18.6.0" TEST_TIMEOUT=15 $runner test_twitter_scrooge_versions "21.2.0" -TEST_TIMEOUT=15 $runner test_reporter "${scala_2_11_version}" "${no_diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_12_version}" "${no_diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_13_version}" "${no_diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_3_version}" "${no_diagnostics_reporter_toolchain}" -TEST_TIMEOUT=15 $runner test_reporter "${scala_2_11_version}" "${diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_12_version}" "${diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_13_version}" "${diagnostics_reporter_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_3_version}" "${diagnostics_reporter_toolchain}" -TEST_TIMEOUT=15 $runner test_reporter "${scala_2_11_version}" "${diagnostics_reporter_and_semanticdb_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_12_version}" "${diagnostics_reporter_and_semanticdb_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_2_13_version}" "${diagnostics_reporter_and_semanticdb_toolchain}" TEST_TIMEOUT=15 $runner test_reporter "${scala_3_version}" "${diagnostics_reporter_and_semanticdb_toolchain}" diff --git a/test_version/WORKSPACE.template b/test_version/WORKSPACE.template index 77101c65c..9d818f083 100644 --- a/test_version/WORKSPACE.template +++ b/test_version/WORKSPACE.template @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index f48e764f0..df25c369a 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -808,8 +808,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.11.17", - "sha256": "a9dc6cc0dbe6ff53a7c914433d5a19711018217b432b385c97778cd4050210d0", + "artifact": "com.thesamet.scalapb:compilerplugin_2.12:1.0.0-alpha.1", + "sha256": "8c771e34186ed2e382a3f4634ec424379d69deab1df2fce4b171cb7cf54e5a5f", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -818,8 +818,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.12:0.11.17", - "sha256": "c984f7695e9a5034afbf725b7eab919fc00bb24dc30c8f6f923d6d32096a1fa0", + "artifact": "com.thesamet.scalapb:lenses_2.12:1.0.0-alpha.1", + "sha256": "c1ba1e1bfe373f5e984c9c7464a9554d16f5c0025820ddbcdb2370878bb72bb9", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -842,8 +842,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.17", - "sha256": "6624beb8e47c11de33262f867dd86d25e66ddce5507c9c13bfd7cc2f2e7652fe", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:1.0.0-alpha.1", + "sha256": "d103300acea36d2ef0fd42fc4b1882144e1761a52b87eae94d3581482582a116", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -852,8 +852,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.17", - "sha256": "7919fbb62f3ae9de9eec3a102b24dc1ef570ff098d1e41e464cf2ac7398cff5f", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:1.0.0-alpha.1", + "sha256": "029260ac16b227b6a037c72ca89c6b3eae0efe5f368ba53f52c9671b9ece9fbc", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 5b3c0ba23..d412994f9 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -830,8 +830,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", - "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1", + "sha256": "218640423ba8156f994d6d700ef960d65025f79a5918070c0898213f4384df1f", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -840,8 +840,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", - "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", + "artifact": "com.thesamet.scalapb:lenses_2.13:1.0.0-alpha.1", + "sha256": "46902feb0fd848fce92e234514254dc43b3cde5f6e10e88ae6eec52f4c016fbc", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -864,8 +864,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", - "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1", + "sha256": "0ceaaf48bc3fa41419fcb8830d21685aea8b7a5e403b90b3246124d9f4b6d087", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -874,8 +874,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", - "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1", + "sha256": "75eb71fea9509308070812b8bcf1eec90c065be3e9d8c60b12098f206db6c581", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index b57cdeca2..5b078fe94 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -878,8 +878,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", - "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1", + "sha256": "218640423ba8156f994d6d700ef960d65025f79a5918070c0898213f4384df1f", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library_2", @@ -888,8 +888,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", - "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", + "artifact": "com.thesamet.scalapb:lenses_2.13:1.0.0-alpha.1", + "sha256": "46902feb0fd848fce92e234514254dc43b3cde5f6e10e88ae6eec52f4c016fbc", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scala_lang_modules_scala_collection_compat", @@ -912,8 +912,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", - "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1", + "sha256": "0ceaaf48bc3fa41419fcb8830d21685aea8b7a5e403b90b3246124d9f4b6d087", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library_2", @@ -922,8 +922,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", - "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1", + "sha256": "75eb71fea9509308070812b8bcf1eec90c065be3e9d8c60b12098f206db6c581", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index 178ece994..5456a8c3f 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -878,8 +878,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", - "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1", + "sha256": "218640423ba8156f994d6d700ef960d65025f79a5918070c0898213f4384df1f", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library_2", @@ -888,8 +888,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", - "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", + "artifact": "com.thesamet.scalapb:lenses_2.13:1.0.0-alpha.1", + "sha256": "46902feb0fd848fce92e234514254dc43b3cde5f6e10e88ae6eec52f4c016fbc", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scala_lang_modules_scala_collection_compat", @@ -912,8 +912,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", - "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1", + "sha256": "0ceaaf48bc3fa41419fcb8830d21685aea8b7a5e403b90b3246124d9f4b6d087", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library_2", @@ -922,8 +922,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", - "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1", + "sha256": "75eb71fea9509308070812b8bcf1eec90c065be3e9d8c60b12098f206db6c581", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 0c88b6390..c9f6d7c74 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -888,8 +888,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17", - "sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92", + "artifact": "com.thesamet.scalapb:compilerplugin_3:1.0.0-alpha.1", + "sha256": "e7d7156269fc23cbb539eea60f07c3230aa05a726434fc942b040495567f0a2d", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -898,8 +898,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_3:0.11.17", - "sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366", + "artifact": "com.thesamet.scalapb:lenses_3:1.0.0-alpha.1", + "sha256": "63fdffc573947402c526c49cf6ee92990ede88d55eb56af5123dfd247b365185", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -922,8 +922,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17", - "sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a", + "artifact": "com.thesamet.scalapb:scalapb-runtime_3:1.0.0-alpha.1", + "sha256": "37ec7d72d56f58e3adb78e385e39ecb927a5097e290f4e51332bbd55fc534a65", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -932,8 +932,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17", - "sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:1.0.0-alpha.1", + "sha256": "0c8574f91693cb08795ed16a601bcf6d5ba46ba8dbd71792910b706cce995c7a", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index 8751f549b..270f595ae 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -879,8 +879,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17", - "sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92", + "artifact": "com.thesamet.scalapb:compilerplugin_3:1.0.0-alpha.1", + "sha256": "e7d7156269fc23cbb539eea60f07c3230aa05a726434fc942b040495567f0a2d", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -889,8 +889,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_3:0.11.17", - "sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366", + "artifact": "com.thesamet.scalapb:lenses_3:1.0.0-alpha.1", + "sha256": "63fdffc573947402c526c49cf6ee92990ede88d55eb56af5123dfd247b365185", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -913,8 +913,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17", - "sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a", + "artifact": "com.thesamet.scalapb:scalapb-runtime_3:1.0.0-alpha.1", + "sha256": "37ec7d72d56f58e3adb78e385e39ecb927a5097e290f4e51332bbd55fc534a65", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -923,8 +923,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17", - "sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:1.0.0-alpha.1", + "sha256": "0c8574f91693cb08795ed16a601bcf6d5ba46ba8dbd71792910b706cce995c7a", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index f2351750d..1339ef8b0 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -879,8 +879,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17", - "sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92", + "artifact": "com.thesamet.scalapb:compilerplugin_3:1.0.0-alpha.1", + "sha256": "e7d7156269fc23cbb539eea60f07c3230aa05a726434fc942b040495567f0a2d", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -889,8 +889,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_3:0.11.17", - "sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366", + "artifact": "com.thesamet.scalapb:lenses_3:1.0.0-alpha.1", + "sha256": "63fdffc573947402c526c49cf6ee92990ede88d55eb56af5123dfd247b365185", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -913,8 +913,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17", - "sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a", + "artifact": "com.thesamet.scalapb:scalapb-runtime_3:1.0.0-alpha.1", + "sha256": "37ec7d72d56f58e3adb78e385e39ecb927a5097e290f4e51332bbd55fc534a65", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -923,8 +923,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17", - "sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:1.0.0-alpha.1", + "sha256": "0c8574f91693cb08795ed16a601bcf6d5ba46ba8dbd71792910b706cce995c7a", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/repositories/scala_3_6.bzl b/third_party/repositories/scala_3_6.bzl index 71d59196c..002715ebc 100644 --- a/third_party/repositories/scala_3_6.bzl +++ b/third_party/repositories/scala_3_6.bzl @@ -888,8 +888,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17", - "sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92", + "artifact": "com.thesamet.scalapb:compilerplugin_3:1.0.0-alpha.1", + "sha256": "e7d7156269fc23cbb539eea60f07c3230aa05a726434fc942b040495567f0a2d", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -898,8 +898,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_3:0.11.17", - "sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366", + "artifact": "com.thesamet.scalapb:lenses_3:1.0.0-alpha.1", + "sha256": "63fdffc573947402c526c49cf6ee92990ede88d55eb56af5123dfd247b365185", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", @@ -922,8 +922,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17", - "sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a", + "artifact": "com.thesamet.scalapb:scalapb-runtime_3:1.0.0-alpha.1", + "sha256": "37ec7d72d56f58e3adb78e385e39ecb927a5097e290f4e51332bbd55fc534a65", "deps": [ "@com_google_protobuf_protobuf_java", "@io_bazel_rules_scala_scala_library", @@ -932,8 +932,8 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17", - "sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:1.0.0-alpha.1", + "sha256": "0c8574f91693cb08795ed16a601bcf6d5ba46ba8dbd71792910b706cce995c7a", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scala_lang_modules_scala_collection_compat", diff --git a/third_party/test/example_external_workspace/.bazelversion b/third_party/test/example_external_workspace/.bazelversion index f22d756da..18bb4182d 100644 --- a/third_party/test/example_external_workspace/.bazelversion +++ b/third_party/test/example_external_workspace/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/third_party/test/example_external_workspace/WORKSPACE b/third_party/test/example_external_workspace/WORKSPACE index 91f5c1d59..a7b9e93b8 100644 --- a/third_party/test/example_external_workspace/WORKSPACE +++ b/third_party/test/example_external_workspace/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") diff --git a/third_party/test/new_local_repo/.bazelversion b/third_party/test/new_local_repo/.bazelversion index f22d756da..18bb4182d 100644 --- a/third_party/test/new_local_repo/.bazelversion +++ b/third_party/test/new_local_repo/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/third_party/test/proto/.bazelversion b/third_party/test/proto/.bazelversion index f22d756da..18bb4182d 100644 --- a/third_party/test/proto/.bazelversion +++ b/third_party/test/proto/.bazelversion @@ -1 +1 @@ -6.5.0 +7.5.0 diff --git a/third_party/test/proto/WORKSPACE b/third_party/test/proto/WORKSPACE index 7092bb8e7..15267e2a2 100644 --- a/third_party/test/proto/WORKSPACE +++ b/third_party/test/proto/WORKSPACE @@ -11,7 +11,7 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() -load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") rules_java_dependencies() @@ -21,9 +21,9 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34", - strip_prefix = "rules_python-0.38.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz", + sha256 = "9c6e26911a79fbf510a8f06d8eedb40f412023cf7fa6d1461def27116bff022c", + strip_prefix = "rules_python-1.1.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.1.0/rules_python-1.1.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -34,6 +34,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + rules_java_toolchains() load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")