Skip to content

Commit f00660e

Browse files
Mr3zeeMr3zee
committed
Update generator to work with proto3 conformance
1 parent 801fab2 commit f00660e

File tree

18 files changed

+1264
-1062
lines changed

18 files changed

+1264
-1062
lines changed

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Any.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public operator fun com.google.protobuf.kotlin.Any.Companion.invoke(body: com.go
4747
}
4848

4949
@kotlinx.rpc.internal.utils.InternalRpcApi
50-
internal fun com.google.protobuf.kotlin.AnyInternal.checkRequiredFields() {
50+
public fun com.google.protobuf.kotlin.AnyInternal.checkRequiredFields() {
5151
// no required fields to check
5252
}
5353

5454
@kotlinx.rpc.internal.utils.InternalRpcApi
55-
internal fun com.google.protobuf.kotlin.AnyInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
55+
public fun com.google.protobuf.kotlin.AnyInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
5656
if (typeUrl.isNotEmpty()) {
5757
encoder.writeString(fieldNr = 1, value = typeUrl)
5858
}
@@ -63,7 +63,7 @@ internal fun com.google.protobuf.kotlin.AnyInternal.encodeWith(encoder: kotlinx.
6363
}
6464

6565
@kotlinx.rpc.internal.utils.InternalRpcApi
66-
internal fun com.google.protobuf.kotlin.AnyInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.AnyInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
66+
public fun com.google.protobuf.kotlin.AnyInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.AnyInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
6767
while (true) {
6868
val tag = decoder.readTag() ?: break // EOF, we read the whole message
6969
when {
@@ -97,7 +97,7 @@ private fun com.google.protobuf.kotlin.AnyInternal.computeSize(): Int {
9797
}
9898

9999
@kotlinx.rpc.internal.utils.InternalRpcApi
100-
internal fun com.google.protobuf.kotlin.Any.asInternal(): com.google.protobuf.kotlin.AnyInternal {
100+
public fun com.google.protobuf.kotlin.Any.asInternal(): com.google.protobuf.kotlin.AnyInternal {
101101
return this as? com.google.protobuf.kotlin.AnyInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
102102
}
103103

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Api.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public operator fun com.google.protobuf.kotlin.Mixin.Companion.invoke(body: com.
143143
}
144144

145145
@kotlinx.rpc.internal.utils.InternalRpcApi
146-
internal fun com.google.protobuf.kotlin.ApiInternal.checkRequiredFields() {
146+
public fun com.google.protobuf.kotlin.ApiInternal.checkRequiredFields() {
147147
// no required fields to check
148148
if (presenceMask[0]) {
149149
sourceContext.asInternal().checkRequiredFields()
@@ -163,7 +163,7 @@ internal fun com.google.protobuf.kotlin.ApiInternal.checkRequiredFields() {
163163
}
164164

165165
@kotlinx.rpc.internal.utils.InternalRpcApi
166-
internal fun com.google.protobuf.kotlin.ApiInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
166+
public fun com.google.protobuf.kotlin.ApiInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
167167
if (name.isNotEmpty()) {
168168
encoder.writeString(fieldNr = 1, value = name)
169169
}
@@ -200,7 +200,7 @@ internal fun com.google.protobuf.kotlin.ApiInternal.encodeWith(encoder: kotlinx.
200200
}
201201

202202
@kotlinx.rpc.internal.utils.InternalRpcApi
203-
internal fun com.google.protobuf.kotlin.ApiInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.ApiInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
203+
public fun com.google.protobuf.kotlin.ApiInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.ApiInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
204204
while (true) {
205205
val tag = decoder.readTag() ?: break // EOF, we read the whole message
206206
when {
@@ -284,20 +284,20 @@ private fun com.google.protobuf.kotlin.ApiInternal.computeSize(): Int {
284284
}
285285

286286
@kotlinx.rpc.internal.utils.InternalRpcApi
287-
internal fun com.google.protobuf.kotlin.Api.asInternal(): com.google.protobuf.kotlin.ApiInternal {
287+
public fun com.google.protobuf.kotlin.Api.asInternal(): com.google.protobuf.kotlin.ApiInternal {
288288
return this as? com.google.protobuf.kotlin.ApiInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
289289
}
290290

291291
@kotlinx.rpc.internal.utils.InternalRpcApi
292-
internal fun com.google.protobuf.kotlin.MethodInternal.checkRequiredFields() {
292+
public fun com.google.protobuf.kotlin.MethodInternal.checkRequiredFields() {
293293
// no required fields to check
294294
options.forEach {
295295
it.asInternal().checkRequiredFields()
296296
}
297297
}
298298

299299
@kotlinx.rpc.internal.utils.InternalRpcApi
300-
internal fun com.google.protobuf.kotlin.MethodInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
300+
public fun com.google.protobuf.kotlin.MethodInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
301301
if (name.isNotEmpty()) {
302302
encoder.writeString(fieldNr = 1, value = name)
303303
}
@@ -330,7 +330,7 @@ internal fun com.google.protobuf.kotlin.MethodInternal.encodeWith(encoder: kotli
330330
}
331331

332332
@kotlinx.rpc.internal.utils.InternalRpcApi
333-
internal fun com.google.protobuf.kotlin.MethodInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.MethodInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
333+
public fun com.google.protobuf.kotlin.MethodInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.MethodInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
334334
while (true) {
335335
val tag = decoder.readTag() ?: break // EOF, we read the whole message
336336
when {
@@ -406,17 +406,17 @@ private fun com.google.protobuf.kotlin.MethodInternal.computeSize(): Int {
406406
}
407407

408408
@kotlinx.rpc.internal.utils.InternalRpcApi
409-
internal fun com.google.protobuf.kotlin.Method.asInternal(): com.google.protobuf.kotlin.MethodInternal {
409+
public fun com.google.protobuf.kotlin.Method.asInternal(): com.google.protobuf.kotlin.MethodInternal {
410410
return this as? com.google.protobuf.kotlin.MethodInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
411411
}
412412

413413
@kotlinx.rpc.internal.utils.InternalRpcApi
414-
internal fun com.google.protobuf.kotlin.MixinInternal.checkRequiredFields() {
414+
public fun com.google.protobuf.kotlin.MixinInternal.checkRequiredFields() {
415415
// no required fields to check
416416
}
417417

418418
@kotlinx.rpc.internal.utils.InternalRpcApi
419-
internal fun com.google.protobuf.kotlin.MixinInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
419+
public fun com.google.protobuf.kotlin.MixinInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
420420
if (name.isNotEmpty()) {
421421
encoder.writeString(fieldNr = 1, value = name)
422422
}
@@ -427,7 +427,7 @@ internal fun com.google.protobuf.kotlin.MixinInternal.encodeWith(encoder: kotlin
427427
}
428428

429429
@kotlinx.rpc.internal.utils.InternalRpcApi
430-
internal fun com.google.protobuf.kotlin.MixinInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.MixinInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
430+
public fun com.google.protobuf.kotlin.MixinInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.MixinInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
431431
while (true) {
432432
val tag = decoder.readTag() ?: break // EOF, we read the whole message
433433
when {
@@ -461,7 +461,7 @@ private fun com.google.protobuf.kotlin.MixinInternal.computeSize(): Int {
461461
}
462462

463463
@kotlinx.rpc.internal.utils.InternalRpcApi
464-
internal fun com.google.protobuf.kotlin.Mixin.asInternal(): com.google.protobuf.kotlin.MixinInternal {
464+
public fun com.google.protobuf.kotlin.Mixin.asInternal(): com.google.protobuf.kotlin.MixinInternal {
465465
return this as? com.google.protobuf.kotlin.MixinInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
466466
}
467467

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Duration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public operator fun com.google.protobuf.kotlin.Duration.Companion.invoke(body: c
4747
}
4848

4949
@kotlinx.rpc.internal.utils.InternalRpcApi
50-
internal fun com.google.protobuf.kotlin.DurationInternal.checkRequiredFields() {
50+
public fun com.google.protobuf.kotlin.DurationInternal.checkRequiredFields() {
5151
// no required fields to check
5252
}
5353

5454
@kotlinx.rpc.internal.utils.InternalRpcApi
55-
internal fun com.google.protobuf.kotlin.DurationInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
55+
public fun com.google.protobuf.kotlin.DurationInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
5656
if (seconds != 0L) {
5757
encoder.writeInt64(fieldNr = 1, value = seconds)
5858
}
@@ -63,7 +63,7 @@ internal fun com.google.protobuf.kotlin.DurationInternal.encodeWith(encoder: kot
6363
}
6464

6565
@kotlinx.rpc.internal.utils.InternalRpcApi
66-
internal fun com.google.protobuf.kotlin.DurationInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.DurationInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
66+
public fun com.google.protobuf.kotlin.DurationInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.DurationInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
6767
while (true) {
6868
val tag = decoder.readTag() ?: break // EOF, we read the whole message
6969
when {
@@ -97,7 +97,7 @@ private fun com.google.protobuf.kotlin.DurationInternal.computeSize(): Int {
9797
}
9898

9999
@kotlinx.rpc.internal.utils.InternalRpcApi
100-
internal fun com.google.protobuf.kotlin.Duration.asInternal(): com.google.protobuf.kotlin.DurationInternal {
100+
public fun com.google.protobuf.kotlin.Duration.asInternal(): com.google.protobuf.kotlin.DurationInternal {
101101
return this as? com.google.protobuf.kotlin.DurationInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
102102
}
103103

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/Empty.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ public operator fun com.google.protobuf.kotlin.Empty.Companion.invoke(body: com.
4444
}
4545

4646
@kotlinx.rpc.internal.utils.InternalRpcApi
47-
internal fun com.google.protobuf.kotlin.EmptyInternal.checkRequiredFields() {
47+
public fun com.google.protobuf.kotlin.EmptyInternal.checkRequiredFields() {
4848
// no required fields to check
4949
}
5050

5151
@kotlinx.rpc.internal.utils.InternalRpcApi
52-
internal fun com.google.protobuf.kotlin.EmptyInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
52+
public fun com.google.protobuf.kotlin.EmptyInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
5353
// no fields to encode
5454
}
5555

5656
@kotlinx.rpc.internal.utils.InternalRpcApi
57-
internal fun com.google.protobuf.kotlin.EmptyInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.EmptyInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
57+
public fun com.google.protobuf.kotlin.EmptyInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.EmptyInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
5858
while (true) {
5959
val tag = decoder.readTag() ?: break // EOF, we read the whole message
6060
when {
@@ -72,7 +72,7 @@ private fun com.google.protobuf.kotlin.EmptyInternal.computeSize(): Int {
7272
}
7373

7474
@kotlinx.rpc.internal.utils.InternalRpcApi
75-
internal fun com.google.protobuf.kotlin.Empty.asInternal(): com.google.protobuf.kotlin.EmptyInternal {
75+
public fun com.google.protobuf.kotlin.Empty.asInternal(): com.google.protobuf.kotlin.EmptyInternal {
7676
return this as? com.google.protobuf.kotlin.EmptyInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
7777
}
7878

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/FieldMask.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public operator fun com.google.protobuf.kotlin.FieldMask.Companion.invoke(body:
4646
}
4747

4848
@kotlinx.rpc.internal.utils.InternalRpcApi
49-
internal fun com.google.protobuf.kotlin.FieldMaskInternal.checkRequiredFields() {
49+
public fun com.google.protobuf.kotlin.FieldMaskInternal.checkRequiredFields() {
5050
// no required fields to check
5151
}
5252

5353
@kotlinx.rpc.internal.utils.InternalRpcApi
54-
internal fun com.google.protobuf.kotlin.FieldMaskInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
54+
public fun com.google.protobuf.kotlin.FieldMaskInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
5555
if (paths.isNotEmpty()) {
5656
paths.forEach {
5757
encoder.writeString(1, it)
@@ -60,7 +60,7 @@ internal fun com.google.protobuf.kotlin.FieldMaskInternal.encodeWith(encoder: ko
6060
}
6161

6262
@kotlinx.rpc.internal.utils.InternalRpcApi
63-
internal fun com.google.protobuf.kotlin.FieldMaskInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.FieldMaskInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
63+
public fun com.google.protobuf.kotlin.FieldMaskInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.FieldMaskInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
6464
while (true) {
6565
val tag = decoder.readTag() ?: break // EOF, we read the whole message
6666
when {
@@ -87,7 +87,7 @@ private fun com.google.protobuf.kotlin.FieldMaskInternal.computeSize(): Int {
8787
}
8888

8989
@kotlinx.rpc.internal.utils.InternalRpcApi
90-
internal fun com.google.protobuf.kotlin.FieldMask.asInternal(): com.google.protobuf.kotlin.FieldMaskInternal {
90+
public fun com.google.protobuf.kotlin.FieldMask.asInternal(): com.google.protobuf.kotlin.FieldMaskInternal {
9191
return this as? com.google.protobuf.kotlin.FieldMaskInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
9292
}
9393

‎protobuf/protobuf-core/src/commonMain/generated-code/kotlin-multiplatform/com/google/protobuf/kotlin/_rpc_internal/SourceContext.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ public operator fun com.google.protobuf.kotlin.SourceContext.Companion.invoke(bo
4646
}
4747

4848
@kotlinx.rpc.internal.utils.InternalRpcApi
49-
internal fun com.google.protobuf.kotlin.SourceContextInternal.checkRequiredFields() {
49+
public fun com.google.protobuf.kotlin.SourceContextInternal.checkRequiredFields() {
5050
// no required fields to check
5151
}
5252

5353
@kotlinx.rpc.internal.utils.InternalRpcApi
54-
internal fun com.google.protobuf.kotlin.SourceContextInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
54+
public fun com.google.protobuf.kotlin.SourceContextInternal.encodeWith(encoder: kotlinx.rpc.protobuf.internal.WireEncoder) {
5555
if (fileName.isNotEmpty()) {
5656
encoder.writeString(fieldNr = 1, value = fileName)
5757
}
5858
}
5959

6060
@kotlinx.rpc.internal.utils.InternalRpcApi
61-
internal fun com.google.protobuf.kotlin.SourceContextInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.SourceContextInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
61+
public fun com.google.protobuf.kotlin.SourceContextInternal.Companion.decodeWith(msg: com.google.protobuf.kotlin.SourceContextInternal, decoder: kotlinx.rpc.protobuf.internal.WireDecoder) {
6262
while (true) {
6363
val tag = decoder.readTag() ?: break // EOF, we read the whole message
6464
when {
@@ -84,7 +84,7 @@ private fun com.google.protobuf.kotlin.SourceContextInternal.computeSize(): Int
8484
}
8585

8686
@kotlinx.rpc.internal.utils.InternalRpcApi
87-
internal fun com.google.protobuf.kotlin.SourceContext.asInternal(): com.google.protobuf.kotlin.SourceContextInternal {
87+
public fun com.google.protobuf.kotlin.SourceContext.asInternal(): com.google.protobuf.kotlin.SourceContextInternal {
8888
return this as? com.google.protobuf.kotlin.SourceContextInternal ?: error("Message ${this::class.simpleName} is a non-internal message type.")
8989
}
9090

0 commit comments

Comments
 (0)