Skip to content

Commit 4651fb6

Browse files
fundthmcalculusfundthmcalculus
authored
Update to protobuf compiler 3.19 (#314)
1 parent f630357 commit 4651fb6

53 files changed

Lines changed: 525 additions & 504 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎devops/generate_proto_files.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ def update_java():
7979
java_path = get_language_dir('java')
8080
java_proto_path = join(java_path, 'src', 'main', 'java')
8181
# clean_proto_dir(java_proto_path)
82-
run_protoc({'java_out': java_proto_path, 'kotlin_out': java_proto_path}, {}, get_proto_files(),
83-
plugin=r"C:\bin\\protoc-gen-grpc-java-1.39.0-windows-x86_64.exe")
82+
run_protoc({'java_out': java_proto_path, 'kotlin_out': java_proto_path}, {}, get_proto_files())
8483

8584

8685
def update_swift():

‎go/okapiproto/examples.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/okapiproto/keys.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/okapiproto/pbmse.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/okapiproto/proofs.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/okapiproto/security.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/okapiproto/transport.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ repositories {
4545

4646
dependencies {
4747
implementation 'org.jetbrains:annotations:22.0.0'
48-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
49-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
50-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'
51-
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.17.3'
48+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
49+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
50+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
51+
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.1'
5252
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
5353
}
5454

‎java/src/main/java/trinsic/okapi/examples/v1/BasicMessageKt.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
package trinsic.okapi.examples.v1;
55

66
@kotlin.jvm.JvmSynthetic
7-
inline fun basicMessage(block: trinsic.okapi.examples.v1.BasicMessageKt.Dsl.() -> Unit): trinsic.okapi.examples.v1.Examples.BasicMessage =
7+
public inline fun basicMessage(block: trinsic.okapi.examples.v1.BasicMessageKt.Dsl.() -> kotlin.Unit): trinsic.okapi.examples.v1.Examples.BasicMessage =
88
trinsic.okapi.examples.v1.BasicMessageKt.Dsl._create(trinsic.okapi.examples.v1.Examples.BasicMessage.newBuilder()).apply { block() }._build()
9-
object BasicMessageKt {
9+
public object BasicMessageKt {
1010
@kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
1111
@com.google.protobuf.kotlin.ProtoDslMarker
12-
class Dsl private constructor(
13-
@kotlin.jvm.JvmField private val _builder: trinsic.okapi.examples.v1.Examples.BasicMessage.Builder
12+
public class Dsl private constructor(
13+
private val _builder: trinsic.okapi.examples.v1.Examples.BasicMessage.Builder
1414
) {
15-
companion object {
15+
public companion object {
1616
@kotlin.jvm.JvmSynthetic
1717
@kotlin.PublishedApi
1818
internal fun _create(builder: trinsic.okapi.examples.v1.Examples.BasicMessage.Builder): Dsl = Dsl(builder)
@@ -25,7 +25,7 @@ object BasicMessageKt {
2525
/**
2626
* <code>string text = 1;</code>
2727
*/
28-
var text: kotlin.String
28+
public var text: kotlin.String
2929
@JvmName("getText")
3030
get() = _builder.getText()
3131
@JvmName("setText")
@@ -35,11 +35,11 @@ object BasicMessageKt {
3535
/**
3636
* <code>string text = 1;</code>
3737
*/
38-
fun clearText() {
38+
public fun clearText() {
3939
_builder.clearText()
4040
}
4141
}
4242
}
4343
@kotlin.jvm.JvmSynthetic
44-
inline fun trinsic.okapi.examples.v1.Examples.BasicMessage.copy(block: trinsic.okapi.examples.v1.BasicMessageKt.Dsl.() -> Unit): trinsic.okapi.examples.v1.Examples.BasicMessage =
44+
public inline fun trinsic.okapi.examples.v1.Examples.BasicMessage.copy(block: trinsic.okapi.examples.v1.BasicMessageKt.Dsl.() -> kotlin.Unit): trinsic.okapi.examples.v1.Examples.BasicMessage =
4545
trinsic.okapi.examples.v1.BasicMessageKt.Dsl._create(this.toBuilder()).apply { block() }._build()

‎java/src/main/java/trinsic/okapi/examples/v1/Examples.java‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)