Skip to content

Commit b3d85eb

Browse files
mblandmbland
committed
Bump versions, add protoc platforms to README
- `rules_java`: 8.10.0 => 8.11.0 - Scalafmt : 3.9.3 => 3.9.4 - `com.google.api.grpc:proto-google-common-protos`: 2.53.0 => 2.54.1 Added a new "Specifying additional `protoc` platforms" section to `README.md` describing the `protoc_platforms` parameter. Also updated the `protoc_platforms` docstring and removed the stale `load_scala_toolchain_dependencies` parameter from `scala_toolchains()`.
1 parent 2933a15 commit b3d85eb

File tree

17 files changed

+209
-174
lines changed

17 files changed

+209
-174
lines changed

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.3"
1+
version = "3.9.4"
22
runner.dialect = scala213
33
align.openParenCallSite = false
44
align.openParenDefnSite = false

‎README.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,41 @@ other toolchain registrations. It's safe to include even when not using
225225
register_toolchains("@rules_scala//protoc:all")
226226
```
227227

228+
#### Specifying additional `protoc` platforms
229+
230+
Use the `protoc_platforms` parameter to specify additional required
231+
[platforms][] if the execution or target platforms differ from the host
232+
platform. Valid values come from [protocolbuffers/protobuf releases][] file name
233+
suffixes. It's also safe to explicitly include the host platform.
234+
235+
[platforms]: https://bazel.build/extending/platforms
236+
[protocolbuffers/protobuf releases]: https://github.com/protocolbuffers/protobuf/releases
237+
238+
For example, imagine the execution or target platform is Linux running on an x86
239+
processor, but the host platform is macOS running on Apple Silicon.
240+
`rules_scala` configures the `"osx-aarch_64"` platform automatically. Then in
241+
`MODULE.bazel` you would include:
242+
243+
```py
244+
# MODULE.bazel
245+
246+
scala_deps.toolchains(
247+
# Other settings...
248+
protoc_platforms = ["linux-x86_64"],
249+
)
250+
```
251+
252+
In `WORKSPACE` you would include:
253+
254+
```py
255+
# WORKSPACE
256+
257+
scala_toolchains(
258+
# Other settings...
259+
protoc_platforms = ["linux-x86_64"],
260+
)
261+
```
262+
228263
#### Temporary required `protobuf` patch
229264

230265
At the moment, enabling protocol compiler toolchainization requires applying

‎scala/deps.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def rules_scala_dependencies():
4545
http_archive,
4646
name = "rules_java",
4747
urls = [
48-
"https://github.com/bazelbuild/rules_java/releases/download/8.10.0/rules_java-8.10.0.tar.gz",
48+
"https://github.com/bazelbuild/rules_java/releases/download/8.11.0/rules_java-8.11.0.tar.gz",
4949
],
50-
sha256 = "476bd403f284e5080037f1910a29ce4c482ac798a3560c2e0df6d6f1857011b6",
50+
sha256 = "d31b6c69e479ffa45460b64dc9c7792a431cac721ef8d5219fc9f603fa2ff877",
5151
)
5252

5353
maybe(

‎scala/toolchains.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ def _get_unknown_entries(entries, allowed_entries):
3232
def scala_toolchains(
3333
maven_servers = default_maven_server_urls(),
3434
overridden_artifacts = {},
35-
load_scala_toolchain_dependencies = True,
3635
fetch_sources = False,
3736
validate_scala_version = True,
3837
scala_compiler_srcjars = {},
@@ -82,9 +81,10 @@ def scala_toolchains(
8281
- exactly one "label", "url", or "urls" key
8382
- optional "integrity" or "sha256" keys
8483
protoc_platforms: Operating system and architecture identifiers for
85-
precompiled protocol compiler releases. If unspecified, will use the
86-
identifier matching the `HOST_CONSTRAINTS` from
87-
`@platforms//host:constraints.bzl`. Only takes effect when
84+
precompiled protocol compiler releases, taken from
85+
protocolbuffers/protobuf releases file name suffixes. If
86+
unspecified, will use the identifier matching the `HOST_CONSTRAINTS`
87+
from `@platforms//host:constraints.bzl`. Only takes effect when
8888
`--incompatible_enable_proto_toolchain_resolution` is `True`.
8989
scalatest: whether to instantiate the ScalaTest toolchain
9090
junit: whether to instantiate the JUnit toolchain

‎scripts/create_repository.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
SBT_COMPILER_INTERFACE_VERSION = '1.10.8'
3030
SBT_UTIL_INTERFACE_VERSION = '1.10.10'
3131
SCALATEST_VERSION = "3.2.19"
32-
SCALAFMT_VERSION = "3.9.3"
32+
SCALAFMT_VERSION = "3.9.4"
3333
KIND_PROJECTOR_VERSION = "0.13.3"
3434
PROTOBUF_JAVA_VERSION = "4.30.0"
3535
JLINE_VERSION = '3.29.0'
3636
SCALAPB_VERSION = '1.0.0-alpha.1'
3737
PROTOC_BRIDGE_VERSION = '0.9.8'
3838
GRPC_VERSION = '1.71.0'
39-
GRPC_COMMON_PROTOS_VERSION = '2.53.0'
39+
GRPC_COMMON_PROTOS_VERSION = '2.54.1'
4040
GRPC_LIBS = ['netty', 'protobuf', 'stub']
4141
GUAVA_VERSION = '33.4.0-jre'
4242

‎test/scalafmt/.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.3"
1+
version = "3.9.4"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt2.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.3"
1+
version = "3.9.4"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt3.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.3"
1+
version = "3.9.4"
22
runner.dialect = scala3
33
maxColumn = 40
44
lineEndings = preserve

‎third_party/repositories/scala_2_11.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,8 @@ artifacts = {
779779
"sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6",
780780
},
781781
"scala_proto_rules_proto_google_common_protos": {
782-
"artifact": "com.google.api.grpc:proto-google-common-protos:2.53.0",
783-
"sha256": "61ac7fbd31a9f604890d22330a6f94b3f410ea2d7247e0f5f11a87ae34087385",
782+
"artifact": "com.google.api.grpc:proto-google-common-protos:2.54.1",
783+
"sha256": "2fcff25fe8a90fcacb146a900222c497ba0a9a531271e6b135a76450d23b1ef2",
784784
"deps": [
785785
"@com_google_protobuf_protobuf_java",
786786
],

‎third_party/repositories/scala_2_12.bzl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ artifacts = {
422422
],
423423
},
424424
"org_scalameta_common": {
425-
"artifact": "org.scalameta:common_2.12:4.13.3",
426-
"sha256": "e6bbe1c30499836c23bcb70846f94b39dbe85f0b513a5c9134b9083e4b9d1c4f",
425+
"artifact": "org.scalameta:common_2.12:4.13.4",
426+
"sha256": "29f64b583396791d2fd07d674b6ea14c66e98070b8c208340a21e945ced3a3f4",
427427
"deps": [
428428
"@com_lihaoyi_sourcecode",
429429
"@io_bazel_rules_scala_scala_library",
@@ -446,8 +446,8 @@ artifacts = {
446446
],
447447
},
448448
"org_scalameta_io": {
449-
"artifact": "org.scalameta:io_2.12:4.13.3",
450-
"sha256": "d00c45f9e51d978507581b5be3041d35d76ca7fd4bb390379aa6e69220f3cc7c",
449+
"artifact": "org.scalameta:io_2.12:4.13.4",
450+
"sha256": "c9c4fba8d686d802afa407434c4cb1f7e276d756389528f8366d5a221fddb7d0",
451451
"deps": [
452452
"@io_bazel_rules_scala_scala_library",
453453
],
@@ -490,25 +490,25 @@ artifacts = {
490490
],
491491
},
492492
"org_scalameta_parsers": {
493-
"artifact": "org.scalameta:parsers_2.12:4.13.3",
494-
"sha256": "e956097a80a2b34caa58f1d3a0a66aeb087cabf9a0ba63a864d1f12f93717393",
493+
"artifact": "org.scalameta:parsers_2.12:4.13.4",
494+
"sha256": "730cb97a4858ed4e5ae3145ae823c568cacd58c294fa73d9aabda3a4f09c4de3",
495495
"deps": [
496496
"@io_bazel_rules_scala_scala_library",
497497
"@org_scalameta_trees",
498498
],
499499
},
500500
"org_scalameta_scalafmt_config": {
501-
"artifact": "org.scalameta:scalafmt-config_2.12:3.9.3",
502-
"sha256": "ed9b17379931ac6e60cf4ee002cce82dbb8563d4571f5a215b6077bd96fbf6e9",
501+
"artifact": "org.scalameta:scalafmt-config_2.12:3.9.4",
502+
"sha256": "ab923b66fadd66675aedd71836e14cc18dbca2573e33e76ed967d72a4c7d78cd",
503503
"deps": [
504504
"@io_bazel_rules_scala_scala_library",
505505
"@org_scalameta_metaconfig_core",
506506
"@org_scalameta_metaconfig_typesafe_config",
507507
],
508508
},
509509
"org_scalameta_scalafmt_core": {
510-
"artifact": "org.scalameta:scalafmt-core_2.12:3.9.3",
511-
"sha256": "59236472850e49f9f26a1582301b9bb301ee4a161a2ffa374e3de30a1635c590",
510+
"artifact": "org.scalameta:scalafmt-core_2.12:3.9.4",
511+
"sha256": "0bde7a0ec2d335b8e722b04f2df04aa99bfcbf92169bd6de5358a0a29abd0ce0",
512512
"deps": [
513513
"@io_bazel_rules_scala_scala_library",
514514
"@org_scalameta_mdoc_parser",
@@ -518,25 +518,25 @@ artifacts = {
518518
],
519519
},
520520
"org_scalameta_scalafmt_macros": {
521-
"artifact": "org.scalameta:scalafmt-macros_2.12:3.9.3",
522-
"sha256": "3802ab7312086c6041be3a139bd7d3c86aca2ed11b77fd1fdca979bf48409d76",
521+
"artifact": "org.scalameta:scalafmt-macros_2.12:3.9.4",
522+
"sha256": "e63c6075b00bb088bb7c6196bee3d1d4bf24a48b82d96afc3a95250de7352672",
523523
"deps": [
524524
"@io_bazel_rules_scala_scala_library",
525525
"@io_bazel_rules_scala_scala_reflect",
526526
"@org_scalameta_scalameta",
527527
],
528528
},
529529
"org_scalameta_scalafmt_sysops": {
530-
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.9.3",
531-
"sha256": "8a73efb3e47372e690ee567446d54305fafc101a07c7f548ae4c50f063451da1",
530+
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.9.4",
531+
"sha256": "692e500687e5b74eff488a127fdbb9e7e70e14eef0942d4a831018042a225a24",
532532
"deps": [
533533
"@com_github_bigwheel_util_backports",
534534
"@io_bazel_rules_scala_scala_library",
535535
],
536536
},
537537
"org_scalameta_scalameta": {
538-
"artifact": "org.scalameta:scalameta_2.12:4.13.3",
539-
"sha256": "071008c35b6292e90ceca9b0f920bd1b93d8332461211afc074d4d9bab9bbfc7",
538+
"artifact": "org.scalameta:scalameta_2.12:4.13.4",
539+
"sha256": "9cd33c7bde177792b70fbc7a071a7016aa59fede9a0c626e040961c2b81c1877",
540540
"deps": [
541541
"@io_bazel_rules_scala_scala_library",
542542
"@org_scalameta_parsers",
@@ -550,8 +550,8 @@ artifacts = {
550550
],
551551
},
552552
"org_scalameta_trees": {
553-
"artifact": "org.scalameta:trees_2.12:4.13.3",
554-
"sha256": "cc925596f20a3bced30f97f08af95bdda7afe9b32e1e46c4af499c76e07f33d7",
553+
"artifact": "org.scalameta:trees_2.12:4.13.4",
554+
"sha256": "a9155e718d0110cb23fc4f5429325ee6fb7487182f646c7cf03d64652d5c41f1",
555555
"deps": [
556556
"@io_bazel_rules_scala_scala_library",
557557
"@org_scalameta_common",
@@ -809,8 +809,8 @@ artifacts = {
809809
"sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6",
810810
},
811811
"scala_proto_rules_proto_google_common_protos": {
812-
"artifact": "com.google.api.grpc:proto-google-common-protos:2.53.0",
813-
"sha256": "61ac7fbd31a9f604890d22330a6f94b3f410ea2d7247e0f5f11a87ae34087385",
812+
"artifact": "com.google.api.grpc:proto-google-common-protos:2.54.1",
813+
"sha256": "2fcff25fe8a90fcacb146a900222c497ba0a9a531271e6b135a76450d23b1ef2",
814814
"deps": [
815815
"@com_google_protobuf_protobuf_java",
816816
],

0 commit comments

Comments
 (0)