diff options
| author | pg <pg@yandex-team.com> | 2023-11-29 12:55:27 +0300 |
|---|---|---|
| committer | pg <pg@yandex-team.com> | 2023-11-29 14:42:59 +0300 |
| commit | f0965a0dfb017878d5aa66400f1cd8ff6460e1a8 (patch) | |
| tree | 0b0cdb8562c1aa00fabce985ad6c6d2e8e583061 /build/conf/proto.conf | |
| parent | beb7e4390106091a99ffa3df0de741f4d37b3aab (diff) | |
| download | ydb-f0965a0dfb017878d5aa66400f1cd8ff6460e1a8.tar.gz | |
Diffstat (limited to 'build/conf/proto.conf')
| -rw-r--r-- | build/conf/proto.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index ac9702f6dc..82506d1eb3 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -1,6 +1,7 @@ # tag:tool-specific tag:proto PROTOC=${tool:"contrib/tools/protoc"} JAVA_PROTOC=${tool:"contrib/tools/protoc"} +NEW_JAVA_PROTOC=yes when ($NEW_JAVA_PROTOC == "yes") { JAVA_PROTOC=${tool:"build/platform/java/protoc"} } @@ -179,7 +180,7 @@ macro WITH_KOTLIN_GRPC() { PEERDIR(build/platform/java/kotlin_grpc) SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${JDK_RESOURCE}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-1.3.1.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out) SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/1.3.1) - SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/3.24.2) + SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/${JAVA_PROTO_RUNTIME_VERSION}) } @@ -445,7 +446,7 @@ macro USE_JAVALITE() { } # tag:proto tag:java-specific -JAVA_PROTO_RUNTIME_VERSION = 3.21.12 +JAVA_PROTO_RUNTIME_VERSION = 3.22.5 JAVA_PROTO_COMMON_VERSION = 1.12.0 JAVA_GRPC_VERSION = 1.43.2 KOTLIN_PROTO=no |