Skip to content

protobuf: Add support for deprecated groups #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 10, 2025
Merged

protobuf: Add support for deprecated groups #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07fcc1f
protobuf: Add Groups encode/decode
Jozott00 Sep 9, 2025
b34449b
protobuf: Add group lists
Jozott00 Sep 9, 2025
a74ed3d
protobuf: Fix unexpected END_GROUP
Jozott00 Sep 10, 2025
c4c0e59
protobuf: Add oneof groups test
Jozott00 Sep 10, 2025
9e2da9b
protobuf: Fix name in ConformanceTest.kt
Jozott00 Sep 10, 2025
969b1bc
pb: Revert autolint changes
Jozott00 Sep 10, 2025
ab7abb1
pb: Remove copyright headers
Jozott00 Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...nMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Any.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ public fun com.google.protobuf.kotlin.AnyInternal.Companion.decodeWith(msg: com.
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
18 changes: 15 additions & 3 deletions ...nMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,12 @@ public fun com.google.protobuf.kotlin.ApiInternal.Companion.decodeWith(msg: com.
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -365,8 +369,12 @@ public fun com.google.protobuf.kotlin.MethodInternal.Companion.decodeWith(msg: c
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -440,8 +448,12 @@ public fun com.google.protobuf.kotlin.MixinInternal.Companion.decodeWith(msg: co
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion .../generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Duration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ public fun com.google.protobuf.kotlin.DurationInternal.Companion.decodeWith(msg:
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...ain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Empty.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ public fun com.google.protobuf.kotlin.EmptyInternal.Companion.decodeWith(msg: co
val tag = decoder.readTag() ?: break // EOF, we read the whole message
when {
else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/FieldMask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ public fun com.google.protobuf.kotlin.FieldMaskInternal.Companion.decodeWith(msg
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...rated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/SourceContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ public fun com.google.protobuf.kotlin.SourceContextInternal.Companion.decodeWith
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
24 changes: 20 additions & 4 deletions ...in/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Struct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,12 @@ public fun com.google.protobuf.kotlin.StructInternal.Companion.decodeWith(msg: c
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -288,8 +292,12 @@ public fun com.google.protobuf.kotlin.ValueInternal.Companion.decodeWith(msg: co
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -362,8 +370,12 @@ public fun com.google.protobuf.kotlin.ListValueInternal.Companion.decodeWith(msg
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -420,8 +432,12 @@ public fun com.google.protobuf.kotlin.StructInternal.FieldsEntryInternal.Compani
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Timestamp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ public fun com.google.protobuf.kotlin.TimestampInternal.Companion.decodeWith(msg
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
30 changes: 25 additions & 5 deletions ...Main/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Type.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,12 @@ public fun com.google.protobuf.kotlin.TypeInternal.Companion.decodeWith(msg: com
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -482,8 +486,12 @@ public fun com.google.protobuf.kotlin.FieldInternal.Companion.decodeWith(msg: co
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -624,8 +632,12 @@ public fun com.google.protobuf.kotlin.EnumInternal.Companion.decodeWith(msg: com
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -710,8 +722,12 @@ public fun com.google.protobuf.kotlin.EnumValueInternal.Companion.decodeWith(msg
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -776,8 +792,12 @@ public fun com.google.protobuf.kotlin.OptionInternal.Companion.decodeWith(msg: c
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
54 changes: 45 additions & 9 deletions .../generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Wrappers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,12 @@ public fun com.google.protobuf.kotlin.DoubleValueInternal.Companion.decodeWith(m
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -430,8 +434,12 @@ public fun com.google.protobuf.kotlin.FloatValueInternal.Companion.decodeWith(ms
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -473,8 +481,12 @@ public fun com.google.protobuf.kotlin.Int64ValueInternal.Companion.decodeWith(ms
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -516,8 +528,12 @@ public fun com.google.protobuf.kotlin.UInt64ValueInternal.Companion.decodeWith(m
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -559,8 +575,12 @@ public fun com.google.protobuf.kotlin.Int32ValueInternal.Companion.decodeWith(ms
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -602,8 +622,12 @@ public fun com.google.protobuf.kotlin.UInt32ValueInternal.Companion.decodeWith(m
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -645,8 +669,12 @@ public fun com.google.protobuf.kotlin.BoolValueInternal.Companion.decodeWith(msg
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -688,8 +716,12 @@ public fun com.google.protobuf.kotlin.StringValueInternal.Companion.decodeWith(m
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down Expand Up @@ -731,8 +763,12 @@ public fun com.google.protobuf.kotlin.BytesValueInternal.Companion.decodeWith(ms
}

else -> {
if (tag.wireType == kotlinx.rpc.protobuf.internal.WireType.END_GROUP) {
throw kotlinx.rpc.protobuf.internal.ProtobufDecodingException("Unexpected END_GROUP tag.")
}

// we are currently just skipping unknown fields (KRPC-191)
decoder.skipValue(tag.wireType)
decoder.skipValue(tag)
}
}
}
Expand Down
Loading
Loading