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..815da58b7 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/WORKSPACE b/WORKSPACE index d45d73099..678d14c0e 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/dt_patches/compiler_sources/.bazelversion +++ b/dt_patches/compiler_sources/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/dt_patches/test_dt_patches/.bazelversion b/dt_patches/test_dt_patches/.bazelversion index f22d756da..815da58b7 100644 --- a/dt_patches/test_dt_patches/.bazelversion +++ b/dt_patches/test_dt_patches/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/dt_patches/test_dt_patches/WORKSPACE b/dt_patches/test_dt_patches/WORKSPACE index 3ecd64c5b..efa1f6116 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.0.tar.gz", ) load("@rules_python//python:repositories.bzl", "py_repositories") @@ -32,6 +32,8 @@ py_repositories() load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +load("@rules_java//java:repositories.bzl", "rules_java_toolchains") + protobuf_deps() rules_java_toolchains() diff --git a/dt_patches/test_dt_patches_user_srcjar/.bazelversion b/dt_patches/test_dt_patches_user_srcjar/.bazelversion index f22d756da..815da58b7 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.4.1 diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 2d2fd5e93..3cb3ed2f2 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/crossbuild/.bazelversion +++ b/examples/crossbuild/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 85d104a82..04e78cfaa 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/scala3/.bazelversion +++ b/examples/scala3/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index c62355166..707be0b3c 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/semanticdb/.bazelversion +++ b/examples/semanticdb/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 14ea2b4a5..ad7c73a32 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/testing/multi_frameworks_toolchain/.bazelversion +++ b/examples/testing/multi_frameworks_toolchain/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/testing/multi_frameworks_toolchain/WORKSPACE b/examples/testing/multi_frameworks_toolchain/WORKSPACE index 52735d65c..8eadde74b 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/testing/scalatest_repositories/.bazelversion +++ b/examples/testing/scalatest_repositories/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/testing/scalatest_repositories/WORKSPACE b/examples/testing/scalatest_repositories/WORKSPACE index 11bcef98a..07e58ab20 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/examples/testing/specs2_junit_repositories/.bazelversion +++ b/examples/testing/specs2_junit_repositories/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/examples/testing/specs2_junit_repositories/WORKSPACE b/examples/testing/specs2_junit_repositories/WORKSPACE index 0a43b04d9..3c6ddb7ad 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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 0069ded6d..e92893adb 100644 --- a/scala/deps.bzl +++ b/scala/deps.bzl @@ -18,41 +18,40 @@ 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.1.0/rules_cc-0.1.0.tar.gz"], + sha256 = "4b12149a041ddfb8306a8fd0e904e39d673552ce82e4296e96fac9cbf0780e59", + strip_prefix = "rules_cc-0.1.0", ) - # 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", + sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3", + strip_prefix = "abseil-cpp-20240722.0", + url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz", ) maybe( http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/8.6.2/rules_java-8.6.2.tar.gz", ], - sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83", + sha256 = "a64ab04616e76a448c2c2d8165d836f0d2fb0906200d0b7c7376f46dd62e59cc", ) 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 = "3d32940e975c4ad9b8ba69640e78f5527075bae33ca2890275bf26b853c0962c", + strip_prefix = "protobuf-29.1", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.1.tar.gz", ) 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 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8", + strip_prefix = "rules_proto-7.0.2", + url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz", ) diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 08658ecc4..4ada84330 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -30,9 +30,9 @@ SCALATEST_VERSION = "3.2.19" SCALAFMT_VERSION = "3.8.3" KIND_PROJECTOR_VERSION = "0.13.3" -PROTOBUF_JAVA_VERSION = "4.29.0" +PROTOBUF_JAVA_VERSION = "4.29.1" JLINE_VERSION = '3.27.1' -SCALAPB_VERSION = '0.11.17' +SCALAPB_VERSION = '1.0.0-alpha.1' PROTOC_BRIDGE_VERSION = '0.9.7' GRPC_VERSION = '1.68.1' GRPC_COMMON_PROTOS_VERSION = '2.48.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..815da58b7 100644 --- a/test/proto_cross_repo_boundary/repo/.bazelversion +++ b/test/proto_cross_repo_boundary/repo/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 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..815da58b7 100644 --- a/test_cross_build/.bazelversion +++ b/test_cross_build/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index a9acbdbeb..88510156f 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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 d5b1aaba1..1a916247d 100755 --- a/test_thirdparty_version.sh +++ b/test_thirdparty_version.sh @@ -20,7 +20,6 @@ $runner test_scala_version "3.3.4" # 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 4c979f8cd..7362f04f2 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.4" -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 c63c59e19..820f15f11 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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_11.bzl b/third_party/repositories/scala_2_11.bzl index e4c882cc6..430db859b 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -67,8 +67,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.11:0.2.6", diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index b25066a41..a60cfeb30 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -82,8 +82,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.12:0.4.0", @@ -797,8 +797,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", @@ -807,8 +807,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", @@ -831,8 +831,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", @@ -841,8 +841,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 891fc654d..b04f602b2 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -819,8 +819,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", @@ -829,8 +829,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", @@ -853,8 +853,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", @@ -863,8 +863,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 e8bda4e22..a4841a93d 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -861,8 +861,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", @@ -871,8 +871,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", @@ -895,8 +895,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", @@ -905,8 +905,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 7d16e7242..c2edc2a82 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -861,8 +861,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", @@ -871,8 +871,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", @@ -895,8 +895,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", @@ -905,8 +905,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 62079504c..7e8acfc52 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -862,8 +862,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", @@ -872,8 +872,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", @@ -896,8 +896,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", @@ -906,8 +906,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_4.bzl b/third_party/repositories/scala_3_4.bzl index 7d7fe65bd..424252547 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -862,8 +862,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", @@ -872,8 +872,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", @@ -896,8 +896,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", @@ -906,8 +906,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_5.bzl b/third_party/repositories/scala_3_5.bzl index 061f8c20f..54fd42cda 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -78,8 +78,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.29.0", - "sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76", + "artifact": "com.google.protobuf:protobuf-java:4.29.1", + "sha256": "c7dc027ca23bca4d56a330c8048e4829d0d9631e745a64fde4d49c3a9341e68b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.4.0", @@ -862,8 +862,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", @@ -872,8 +872,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", @@ -896,8 +896,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", @@ -906,8 +906,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/test/example_external_workspace/.bazelversion b/third_party/test/example_external_workspace/.bazelversion index f22d756da..815da58b7 100644 --- a/third_party/test/example_external_workspace/.bazelversion +++ b/third_party/test/example_external_workspace/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/third_party/test/example_external_workspace/WORKSPACE b/third_party/test/example_external_workspace/WORKSPACE index e4e9652e7..0f09e3ac8 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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..815da58b7 100644 --- a/third_party/test/new_local_repo/.bazelversion +++ b/third_party/test/new_local_repo/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/third_party/test/proto/.bazelversion b/third_party/test/proto/.bazelversion index f22d756da..815da58b7 100644 --- a/third_party/test/proto/.bazelversion +++ b/third_party/test/proto/.bazelversion @@ -1 +1 @@ -6.5.0 +7.4.1 diff --git a/third_party/test/proto/WORKSPACE b/third_party/test/proto/WORKSPACE index 36b725293..59eeff99f 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 = "4f7e2aa1eb9aa722d96498f5ef514f426c1f55161c3c9ae628c857a7128ceb07", + strip_prefix = "rules_python-1.0.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.0.0/rules_python-1.0.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")