aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2023-12-02 09:25:50 +0300
committersnermolaev <snermolaev@yandex-team.com>2023-12-02 09:45:22 +0300
commiteec61af1ec6b8bc03ccfcaed1f5058b275a696b6 (patch)
treea27d5dcd9c10d0f1c4247097097b2d65e97547e3
parent1a402b72b2a2198c72fcbb7949a3b0486a9b5890 (diff)
downloadydb-eec61af1ec6b8bc03ccfcaed1f5058b275a696b6.tar.gz
Align protoc version for java with one in Arcadia
-rw-r--r--build/export_generators/gradle/build.gradle.kts.proto.jinja8
-rw-r--r--build/export_generators/ide-gradle/build.gradle.kts.proto.jinja8
2 files changed, 12 insertions, 4 deletions
diff --git a/build/export_generators/gradle/build.gradle.kts.proto.jinja b/build/export_generators/gradle/build.gradle.kts.proto.jinja
index fe19ef73c0..b935c5953b 100644
--- a/build/export_generators/gradle/build.gradle.kts.proto.jinja
+++ b/build/export_generators/gradle/build.gradle.kts.proto.jinja
@@ -37,8 +37,12 @@ dependencies {
{% endif -%}
}
-{% if targets[0].proto_grpc is defined -%}
protobuf {
+ protoc {
+ // Download from repositories
+ artifact = "com.google.protobuf:protoc:3.22.5"
+ }
+{% if targets[0].proto_grpc is defined -%}
plugins {
id("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.45.0"
@@ -51,8 +55,8 @@ protobuf {
}
}
}
-}
{% endif -%}
+}
val prepareProto = tasks.register<Copy>("prepareProto") {
from(rootDir) {
diff --git a/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja b/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja
index fe19ef73c0..b935c5953b 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja
@@ -37,8 +37,12 @@ dependencies {
{% endif -%}
}
-{% if targets[0].proto_grpc is defined -%}
protobuf {
+ protoc {
+ // Download from repositories
+ artifact = "com.google.protobuf:protoc:3.22.5"
+ }
+{% if targets[0].proto_grpc is defined -%}
plugins {
id("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.45.0"
@@ -51,8 +55,8 @@ protobuf {
}
}
}
-}
{% endif -%}
+}
val prepareProto = tasks.register<Copy>("prepareProto") {
from(rootDir) {