[swift] Fix edge case for oneof field named self#3360
Merged
Conversation
dnkoutso
commented
Aug 7, 2025
| string screen_oneof_string = 1; | ||
| int32 screen_oneof_int32 = 2; | ||
| SubMessage screen_oneof_sub_message = 3; | ||
| Self self = 4; |
Collaborator
Author
There was a problem hiding this comment.
generated code fails to compile without the above change.
jszumski
approved these changes
Aug 7, 2025
svc-squareup-copybara
pushed a commit
to cashapp/misk
that referenced
this pull request
Aug 8, 2025
| Package | Type | Package file | Manager | Update | Change | |---|---|---|---|---|---| | [io.lettuce:lettuce-core](https://github.com/redis/lettuce) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `6.7.1.RELEASE` -> `6.8.0.RELEASE` | | [com.squareup.wire](https://github.com/square/wire) | plugin | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-schema](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-runtime](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-reflector](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-moshi-adapter](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-grpc-client](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | | [com.squareup.wire:wire-bom](https://github.com/square/wire) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `5.3.7` -> `5.3.8` | --- ### Release Notes <details> <summary>redis/lettuce (io.lettuce:lettuce-core)</summary> ### [`v6.8.0.RELEASE`](https://github.com/redis/lettuce/releases/tag/6.8.0.RELEASE) [Compare Source](redis/lettuce@6.7.1.RELEASE...6.8.0.RELEASE) The Lettuce team is pleased to announce the Lettuce 6.8.0 minor release! This release provides support for the newly introduced [Redis Query Engine support](https://redis.github.io/lettuce/user-guide/redis-search/) which was is part of Redis 8.0 and previously - as part of RedisStack. The new operators (`DIFF`, `DIFF1`, `ANDOR` and `ONE`) for the `BITOP` command are also available. The team has worked on extending the contract of the `XADD` and `XTRIM ` commands to support trimming policy, and also introduced the new `XDELEX` and `XACKDEL` commands. Lettuce 6.8.0 supports Redis 2.6+ up to Redis 8.x. In terms of Java runtime, Lettuce requires at least Java 8 and works with Java 24. The driver is tested against Redis 8.2, Redis 8.0, Redis 7.4 and Redis 7.2. Find the full changelog at the end of this document. Thanks to all contributors who made Lettuce 6.8.0.RELEASE possible. 📗 Links Reference documentation: https://lettuce.io/core/6.8.0.RELEASE/reference/ Javadoc: https://lettuce.io/core/6.8.0.RELEASE/api/ ⭐ New Features Introduce RediSearch by [@​tishun](https://github.com/tishun) in redis/lettuce#3375 Add support for new operations of BITOP command in Redis Community Edition 8.2 by [@​atakavci](https://github.com/atakavci) in redis/lettuce#3334 Add support for 8.2 stream commands by [@​uglide](https://github.com/uglide) in redis/lettuce#3374 🐞 Bug Fixes NoClassDefFoundError in Lettuce 6.7.0 [#​3317](redis/lettuce#3317) by [@​tishun](https://github.com/tishun) in redis/lettuce#3318 💡 Other The instance of the `ObjectMapper` can now be reused in the `DefaultJsonParser` by [@​thachlp](https://github.com/thachlp) in redis/lettuce#3372 Added basic connection interruption tests by [@​uglide](https://github.com/uglide) in redis/lettuce#3292 DOC-4758 async JSON doc examples by [@​andy-stark-redis](https://github.com/andy-stark-redis) in redis/lettuce#3335 Fixed SocketOptions.Builder validation messages by [@​hubertchylik](https://github.com/hubertchylik) in redis/lettuce#3366 Refactor tests for clarity and maintainability by [@​Rian-Ismael](https://github.com/Rian-Ismael) in redis/lettuce#3363 Provide support for the SVS-VMANA index ([#​3385](redis/lettuce#3385)) by [@​tishun](https://github.com/tishun) in redis/lettuce#3386 ❤️ New Contributors## New Contributors - [@​hubertchylik](https://github.com/hubertchylik) made their first contribution in redis/lettuce#3366 **Full Changelog**: redis/lettuce@6.7.0.RELEASE...6.8.0.RELEASE </details> <details> <summary>square/wire (com.squareup.wire)</summary> ### [`v5.3.8`](https://github.com/square/wire/blob/HEAD/CHANGELOG.md#Version-538) [Compare Source](square/wire@5.3.7...5.3.8) *2025-08-08* ##### Swift - Fix edge case for oneof field named `self` ([#​3360](square/wire#3360) by \[Dimitris Koutsogiorgas]\[dnkoutso]) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6pm every weekday,before 2am every weekday" in timezone Australia/Melbourne, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). GitOrigin-RevId: f26d0f3a5bf8e0f695433640efc9d6e93850ab60
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We have a rather badly named
message Selfin one of our protos that is throwing off again the Swift compiler.SwiftPoet does the right thing to escape it with backticks however other parts of the generated code start failing.
For Wire, we rename `Self` with Self_