Skip to content

Commit 0c2a2ea

Browse files
author
Alexander Furer
committed
1. gradle-4.6
2. grpcVersion = '1.10.0' 3. com.google.protobuf:protoc:3.5.1
1 parent f7aa011 commit 0c2a2ea

File tree

8 files changed

+201
-103
lines changed

8 files changed

+201
-103
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
buildscript {
33
ext {
44
springBootVersion = '1.5.9.RELEASE'
5-
grpcVersion = '1.9.0'
5+
grpcVersion = '1.10.0'
66
}
77
repositories {
88
mavenCentral()
@@ -14,7 +14,7 @@ buildscript {
1414
dependencies {
1515
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
1616
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"
17-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
17+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
1818
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.0.0"
1919
classpath 'com.palantir:jacoco-coverage:0.4.0'
2020
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'

gradle/wrapper/gradle-wrapper.jar

-232 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jul 23 13:11:27 PDT 2016
1+
#Mon Mar 19 15:06:58 IST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

grpc-spring-boot-starter-demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sourceSets {
2222

2323
protobuf {
2424
protoc {
25-
artifact = 'com.google.protobuf:protoc:3.0.0'
25+
artifact = 'com.google.protobuf:protoc:3.5.1'
2626
}
2727
plugins {
2828
grpc {

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
*/
2020
@javax.annotation.Generated(
21-
value = "by gRPC proto compiler (version 1.8.0)",
21+
value = "by gRPC proto compiler (version 1.10.0)",
2222
comments = "Source: calculator.proto")
2323
public final class CalculatorGrpc {
2424

@@ -30,14 +30,19 @@ private CalculatorGrpc() {}
3030
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
3131
@java.lang.Deprecated // Use {@link #getCalculateMethod()} instead.
3232
public static final io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
33-
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> METHOD_CALCULATE = getCalculateMethod();
33+
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> METHOD_CALCULATE = getCalculateMethodHelper();
3434

3535
private static volatile io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
3636
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
3737

3838
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
3939
public static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
4040
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
41+
return getCalculateMethodHelper();
42+
}
43+
44+
private static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
45+
io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethodHelper() {
4146
io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
4247
if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
4348
synchronized (CalculatorGrpc.class) {
@@ -91,13 +96,13 @@ public static abstract class CalculatorImplBase implements io.grpc.BindableServi
9196
*/
9297
public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
9398
io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
94-
asyncUnimplementedUnaryCall(getCalculateMethod(), responseObserver);
99+
asyncUnimplementedUnaryCall(getCalculateMethodHelper(), responseObserver);
95100
}
96101

97102
@java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
98103
return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
99104
.addMethod(
100-
getCalculateMethod(),
105+
getCalculateMethodHelper(),
101106
asyncUnaryCall(
102107
new MethodHandlers<
103108
io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
@@ -130,7 +135,7 @@ protected CalculatorStub build(io.grpc.Channel channel,
130135
public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
131136
io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
132137
asyncUnaryCall(
133-
getChannel().newCall(getCalculateMethod(), getCallOptions()), request, responseObserver);
138+
getChannel().newCall(getCalculateMethodHelper(), getCallOptions()), request, responseObserver);
134139
}
135140
}
136141

@@ -156,7 +161,7 @@ protected CalculatorBlockingStub build(io.grpc.Channel channel,
156161
*/
157162
public io.grpc.examples.CalculatorOuterClass.CalculatorResponse calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
158163
return blockingUnaryCall(
159-
getChannel(), getCalculateMethod(), getCallOptions(), request);
164+
getChannel(), getCalculateMethodHelper(), getCallOptions(), request);
160165
}
161166
}
162167

@@ -183,7 +188,7 @@ protected CalculatorFutureStub build(io.grpc.Channel channel,
183188
public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> calculate(
184189
io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
185190
return futureUnaryCall(
186-
getChannel().newCall(getCalculateMethod(), getCallOptions()), request);
191+
getChannel().newCall(getCalculateMethodHelper(), getCallOptions()), request);
187192
}
188193
}
189194

@@ -271,7 +276,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
271276
if (result == null) {
272277
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
273278
.setSchemaDescriptor(new CalculatorFileDescriptorSupplier())
274-
.addMethod(getCalculateMethod())
279+
.addMethod(getCalculateMethodHelper())
275280
.build();
276281
}
277282
}

0 commit comments

Comments
 (0)