Skip to content
This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Commit a150982

Browse files
authored
Upgrade dependencies (#55)
* Upgrade Gradle version to 5.6.1 This commit also adjusts build.gradle files, so that they are compatible with the new Gradle version. Protobuf plugin now requires Java 8. This is reflected in README.md I've checked the new configuration works by invoking Gradle tasks: project tasks build check clean eclipse javadoc. * Update the dependency versions of gRPC and Protobuf. As those libraries provide a BOM, we can put version dependency on BOM file as well.
1 parent a920a67 commit a150982

4 files changed

Lines changed: 27 additions & 10 deletions

File tree

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,18 @@ subprojects {
7676
sourceCompatibility = project.sourceCompatibility
7777
targetCompatibility = project.targetCompatibility
7878
}
79+
80+
ext {
81+
libraries = [
82+
grpcBom: "io.grpc:grpc-bom:${grpcVersion}",
83+
grpcStub: "io.grpc:grpc-stub",
84+
grpcProtobuf: "io.grpc:grpc-protobuf",
85+
86+
protobufJavaBom: "com.google.protobuf:protobuf-bom:${protobufJavaVersion}",
87+
protobufJava: "com.google.protobuf:protobuf-java",
88+
protobufJavaUtil: "com.google.protobuf:protobuf-java-util",
89+
]
90+
}
7991
}
8092

8193
def configureMaven(project, projectName, projectDescription) {

endpoints-management-protos/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,33 @@ apply plugin: 'com.google.protobuf'
1212

1313
description = 'GRPC library for the servicecontrol-v1 service'
1414
// TODO: use a flag to determine whether to produce a release or a snapshot
15-
sourceCompatibility = 1.6
16-
targetCompatibility = 1.6
15+
sourceCompatibility = 1.8
16+
targetCompatibility = 1.8
1717

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

2323
dependencies {
24-
compile "com.google.protobuf:protobuf-java:3.0.0"
25-
compile "io.grpc:grpc-protobuf:1.14.0"
26-
compile "io.grpc:grpc-stub:1.14.0"
24+
compile platform(libraries.protobufJavaBom),
25+
libraries.protobufJava
26+
27+
compile platform(libraries.grpcBom),
28+
libraries.grpcStub,
29+
libraries.grpcProtobuf
2730
}
2831

2932
protobuf {
3033
protoc {
3134
// The version of protoc must match protobuf-java. If you don't depend on
3235
// protobuf-java directly, you will be transitively depending on the
3336
// protobuf-java version that grpc depends on.
34-
artifact = "com.google.protobuf:protoc:3.0.0-beta-4"
37+
artifact = "com.google.protobuf:protoc:${protobufJavaVersion}"
3538
}
3639
plugins {
3740
grpc {
38-
artifact = 'io.grpc:protoc-gen-grpc-java:0.15.0'
41+
artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
3942
}
4043
}
4144
generateProtoTasks {

endpoints-service-config/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ archivesBaseName = 'endpoints-management-config'
2323

2424
dependencies {
2525
compile(project(":endpoints-management-protos"))
26-
compile "com.google.protobuf:protobuf-java:3.0.0"
26+
compile platform(libraries.protobufJavaBom)
27+
compile "com.google.protobuf:protobuf-java"
2728
compile "com.google.apis:google-api-services-servicemanagement:$servicemanagementVersion"
2829
compileOnly "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
2930
compile "com.google.guava:guava:$guavaVersion"
3031
compile "com.google.http-client:google-http-client:$httpClientVersion"
31-
compile "com.google.protobuf:protobuf-java-util:$protobufUtilVersion"
32+
compile "com.google.protobuf:protobuf-java-util"
3233

3334
testCompile "org.mockito:mockito-core:$mockitoVersion"
3435
testCompile "junit:junit:$junitVersion"

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ commonsLang3Version = 3.4
2525
googleApiClientProtobufVersion = 1.22.0
2626
googleApiClientAppEngineVersion = 1.22.0
2727
googleapisCommonProtosVersion = 0.0.3
28+
grpcVersion = 1.22.1
2829
grpcGoogleApiVersion = 0.7.0-SNAPSHOT
2930
guavaVersion = 19.0
3031
httpClientVersion = 1.22.0
@@ -33,7 +34,7 @@ jerseyVersion = 2.23.1
3334
jettyVersion = 9.3.0.M0
3435
jose4jVersion = 0.6.4
3536
jsr305Version = 2.0.1
36-
protobufUtilVersion = 3.0.0-beta-4
37+
protobufJavaVersion = 3.9.1
3738
servicemanagementVersion = v1-rev14-1.22.0
3839
servletApiVersion = 2.5
3940
truthVersion = 0.27

0 commit comments

Comments
 (0)