Skip to content

Commit a9001ee

Browse files
authored
Gradle update to 7.6 (#211)
* chore: update gradle to 7.6 * chore: format files to satisfy updated google-java-format. * Update cloudbuild.yaml * Fix gradle wrapper * Use Java 17 for Cloudbuild
1 parent cbc3149 commit a9001ee

10 files changed

Lines changed: 228 additions & 147 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Gradle
22
build
3-
gradle.properties
43
.gradle
54
local.properties
65
out

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- name: openjdk:11.0-jdk
2+
- name: openjdk:17-jdk-slim
33
dir: 'grpc-gcp'
44
env:
55
- 'GCP_PROJECT_ID=grpc-gcp-testing'

grpc-gcp/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id 'java'
2+
id 'java-library'
33
id 'maven-publish'
44
id 'signing'
55
id 'com.google.protobuf' version '0.9.4'
66
id 'com.github.sherter.google-java-format' version '0.9'
7-
id 'io.codearte.nexus-staging' version '0.8.0'
7+
id 'io.codearte.nexus-staging' version '0.30.0'
88
}
99

1010
repositories {
@@ -35,8 +35,6 @@ dependencies {
3535
implementation "io.opencensus:opencensus-api:${opencensusVersion}"
3636
implementation "com.google.api:api-common:2.1.5"
3737

38-
compileOnly "org.apache.tomcat:annotations-api:6.0.53" // necessary for Java 9+
39-
4038
testImplementation "com.google.auth:google-auth-library-credentials:0.13.0"
4139
testImplementation "com.google.cloud:google-cloud-spanner:${spannerVersion}"
4240
testImplementation "com.google.cloud:google-cloud-bigtable:0.107.0"
@@ -164,6 +162,5 @@ signing {
164162
}
165163

166164
googleJavaFormat {
167-
// Latest GJF that supports Java 8.
168-
toolVersion = "1.7"
165+
toolVersion = '1.26.0'
169166
}

grpc-gcp/gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
2+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
3+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
4+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
5+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
6.23 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Aug 26 15:05:15 PDT 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip

0 commit comments

Comments
 (0)