diff --git a/build.gradle b/build.gradle index 189d4d6a9b..f7af3edc2f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0' classpath 'org.openjfx:javafx-plugin:0.0.10' } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 4e74fc2872..6ccca570f0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -379,6 +379,14 @@ + + + + + + + + @@ -387,6 +395,22 @@ + + + + + + + + + + + + + + + + @@ -395,6 +419,14 @@ + + + + + + + + @@ -424,6 +456,11 @@ + + + + + @@ -476,6 +513,11 @@ + + + + + @@ -489,6 +531,14 @@ + + + + + + + + @@ -751,6 +801,14 @@ + + + + + + + + @@ -759,6 +817,14 @@ + + + + + + + + diff --git a/proto/build.gradle b/proto/build.gradle index d52577e3fd..bd6032907c 100644 --- a/proto/build.gradle +++ b/proto/build.gradle @@ -1,10 +1,9 @@ plugins { id 'bisq.java-conventions' + id 'idea' + id 'com.google.protobuf' version "0.9.3" } -apply plugin: 'com.google.protobuf' -apply plugin: 'idea' - dependencies { implementation enforcedPlatform(project(':platform')) annotationProcessor libs.lombok @@ -29,12 +28,22 @@ protobuf { protoc { artifact = "com.google.protobuf:protoc:3.19.1" } + plugins { grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.42.1" } } + generateProtoTasks { - ofSourceSet('main')*.plugins { grpc {} } + ofSourceSet('main').configureEach { + plugins { + // Apply the "grpc" plugin whose spec is defined above, without + // options. Note the braces cannot be omitted, otherwise the + // plugin will not be added. This is because of the implicit way + // NamedDomainObjectContainer binds the methods. + grpc { } + } + } } }