Skip to content

Commit b8e4db5

Browse files
vancexumeiliang86
authored andcommitted
Fix broken build (#362)
1 parent 20df854 commit b8e4db5

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
plugins {
88
id 'net.minecrell.licenser' version '0.3'
99
id "com.github.sherter.google-java-format" version "0.6"
10-
id "net.ltgt.errorprone" version "0.0.13"
10+
id "net.ltgt.errorprone" version "0.6"
1111
}
1212

1313
repositories {
@@ -45,6 +45,8 @@ sourceCompatibility = 1.8
4545
targetCompatibility = 1.8
4646

4747
dependencies {
48+
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
49+
errorprone("com.google.errorprone:error_prone_core:2.3.1")
4850
compile group: 'com.uber.tchannel', name: 'tchannel-core', version: '0.8.5'
4951
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
5052
compile group: 'org.apache.thrift', name: 'libthrift', version: '0.9.3'
@@ -65,8 +67,8 @@ license {
6567
compileJava {
6668
dependsOn 'googleJavaFormat'
6769
options.encoding = 'UTF-8'
68-
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-XepExcludedPaths:" +
69-
".*/generated-sources/.*" << "-Werror"
70+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
71+
options.errorprone.errorproneArgs << "-XepExcludedPaths:.*/generated-sources/.*"
7072
}
7173

7274
// Generation version.properties for value to be included into the request header
@@ -90,8 +92,8 @@ classes {
9092

9193
compileTestJava {
9294
options.encoding = 'UTF-8'
93-
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-XepExcludedPaths:" +
94-
".*/generated-sources/.*" << "-Werror"
95+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
96+
options.errorprone.errorproneArgs << "-XepExcludedPaths:.*/generated-sources/.*"
9597
}
9698

9799
if (JavaVersion.current().isJava8Compatible()) {

docker/buildkite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:8-jre
1+
FROM openjdk:8
22

33
ENV APACHE_THRIFT_VERSION=0.9.3
44

docker/buildkite/Dockerfile-local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:8-jre
1+
FROM openjdk:8
22

33
COPY --from=thrift:0.9.3 /usr/local/bin/thrift /usr/local/bin/thrift
44

gradle/wrapper/gradle-wrapper.jar

-4 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Feb 20 18:23:56 PST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip

src/main/java/com/uber/cadence/client/WorkflowClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -729,8 +729,6 @@ static <A1, A2, A3, A4, A5, A6, R> CompletableFuture<R> execute(
729729
return WorkflowClientInternal.execute(workflow, arg1, arg2, arg3, arg4, arg5, arg6);
730730
}
731731

732-
/**
733-
* Closes the workflow client and the underlying IWorkflowService when this method is called.
734-
*/
732+
/** Closes the workflow client and the underlying IWorkflowService when this method is called. */
735733
void close();
736734
}

0 commit comments

Comments
 (0)