Skip to content

Commit 244f87e

Browse files
author
Dave Syer
committed
Fix some gradle builds
1 parent babe000 commit 244f87e

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

samples/grpc-oauth2/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,20 @@ tasks.named('test') {
4242
}
4343

4444
protobuf {
45-
protoc {
46-
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
47-
}
48-
plugins {
49-
grpc {
50-
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
51-
}
52-
}
53-
generateProtoTasks {
54-
all()*.plugins {
55-
grpc {
45+
protoc {
46+
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
47+
}
48+
plugins {
49+
grpc {
50+
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
51+
}
52+
}
53+
generateProtoTasks {
54+
all()*.plugins {
55+
grpc {
5656
option 'jakarta_omit'
57+
option '@generated=omit'
5758
}
5859
}
59-
}
60+
}
6061
}

samples/grpc-secure/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,20 @@ tasks.named('test') {
4242
}
4343

4444
protobuf {
45-
protoc {
46-
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
47-
}
48-
plugins {
49-
grpc {
50-
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
51-
}
52-
}
53-
generateProtoTasks {
54-
all()*.plugins {
55-
grpc {
45+
protoc {
46+
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
47+
}
48+
plugins {
49+
grpc {
50+
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
51+
}
52+
}
53+
generateProtoTasks {
54+
all()*.plugins {
55+
grpc {
5656
option 'jakarta_omit'
57+
option '@generated=omit'
5758
}
5859
}
59-
}
60+
}
6061
}

0 commit comments

Comments
 (0)