Skip to content

Commit c754153

Browse files
jyaneericgribkoff
authored andcommitted
Update example dependencies (#19)
1. Update gradle to 4.9 - Same as grpc-java, see also: grpc/grpc-java@94b2618 2. Update error-prone to 2.3.2 3. Update grpc to 1.17.1 - Add a grpc project name prefix to `io_grpc_grpc_java`
1 parent d1b894d commit c754153

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

examples/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ java_library(
22
name = "example",
33
srcs = glob(["src/main/java/com/example/*.java"]),
44
deps = [
5-
"@grpc_java//core",
5+
"@io_grpc_grpc_java//core",
66
],
77
plugins = [
88
":io_grpc_grpc_java_api_checker_plugin",

examples/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
workspace(name = "example")
22

33
http_archive(
4-
name = "grpc_java",
5-
strip_prefix = "grpc-java-1.10.0",
6-
urls = ["https://github.com/grpc/grpc-java/archive/v1.10.0.zip"],
4+
name = "io_grpc_grpc_java",
5+
strip_prefix = "grpc-java-1.17.1",
6+
urls = ["https://github.com/grpc/grpc-java/archive/v1.17.1.zip"],
77
)
88

9-
load("@grpc_java//:repositories.bzl", "grpc_java_repositories")
9+
load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
1010

1111
grpc_java_repositories()
1212

examples/build.gradle

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import net.ltgt.gradle.errorprone.CheckSeverity
2+
13
buildscript {
24
repositories {
35
mavenCentral()
@@ -6,30 +8,30 @@ buildscript {
68
}
79
}
810
dependencies {
9-
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
10-
classpath "net.ltgt.gradle:gradle-apt-plugin:0.13"
11+
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6'
1112
}
1213
}
1314

1415
apply plugin: 'java'
1516
apply plugin: 'net.ltgt.errorprone'
16-
apply plugin: 'net.ltgt.apt'
1717

1818
repositories {
1919
mavenLocal()
2020
mavenCentral()
2121
}
2222

2323
dependencies {
24-
compile 'io.grpc:grpc-core:1.10.0'
25-
apt 'io.grpc:grpc-java-api-checker:1.1.0'
26-
}
27-
28-
configurations.errorprone {
29-
resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.2.0'
24+
compile 'io.grpc:grpc-core:1.17.1'
25+
annotationProcessor 'io.grpc:grpc-java-api-checker:1.1.0'
26+
errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
27+
errorprone 'com.google.errorprone:error_prone_core:2.3.2'
3028
}
3129

3230
compileJava {
3331
// you can specify the settings
34-
options.compilerArgs += ["-XepDisableAllChecks", "-Xep:GrpcInternal:ERROR", "-Xep:GrpcExperimentalApi:ERROR"]
32+
options.errorprone {
33+
disableAllChecks = true
34+
check("GrpcExperimentalApi", CheckSeverity.ERROR)
35+
check("GrpcInternal", CheckSeverity.ERROR)
36+
}
3537
}

examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<dependency>
1212
<groupId>io.grpc</groupId>
1313
<artifactId>grpc-core</artifactId>
14-
<version>1.10.0</version>
14+
<version>1.17.1</version>
1515
</dependency>
1616
</dependencies>
1717

@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.errorprone</groupId>
5151
<artifactId>error_prone_core</artifactId>
52-
<version>2.2.0</version>
52+
<version>2.3.2</version>
5353
</dependency>
5454
</dependencies>
5555
</plugin>

0 commit comments

Comments
 (0)