flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gradle 8.3 

Examples are updated to use the new version as well, which wasn't done
last time in f3f4ed4ef. That noticed some things that were missed
before.
This commit is contained in:
Eric Anderson 2023-08-18 08:32:19 -07:00
parent 67f4eabb42
commit ceadf6df6d
14 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/build.gradle
View File

@ -78,9 +78,11 @@ def createStartScripts(String mainClassName) {
outputDir = new File(project.buildDir, 'tmp/scripts/' + name) outputDir = new File(project.buildDir, 'tmp/scripts/' + name)
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(newTask) applicationDistribution.into('bin') {
fileMode = 0755 from(newTask)
fileMode = 0755
}
} }
} }

13
examples/example-alts/build.gradle
View File

@ -1,8 +1,7 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }
@ -71,8 +70,10 @@ task helloWorldAltsClient(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(helloWorldAltsServer) applicationDistribution.into('bin') {
from(helloWorldAltsClient) from(helloWorldAltsServer)
fileMode = 0755 from(helloWorldAltsClient)
fileMode = 0755
}
} }

12
examples/example-debug/build.gradle
View File

@ -2,7 +2,7 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples. id 'application' // Provide convenience executables for trying out the examples.
id 'java' id 'java'
id "com.google.protobuf" version "0.8.17" id "com.google.protobuf" version "0.9.4"
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
@ -71,8 +71,10 @@ task HostnameDebuggableServer(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(HelloWorldDebuggableClient) applicationDistribution.into('bin') {
from(HostnameDebuggableServer) from(HelloWorldDebuggableClient)
fileMode = 0755 from(HostnameDebuggableServer)
fileMode = 0755
}
} }

11
examples/example-gauth/build.gradle
View File

@ -1,8 +1,7 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }
@ -69,7 +68,9 @@ task googleAuthClient(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(googleAuthClient) applicationDistribution.into('bin') {
fileMode = 0755 from(googleAuthClient)
fileMode = 0755
}
} }

13
examples/example-gcp-observability/build.gradle
View File

@ -1,8 +1,7 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
id 'java' id 'java'
@ -63,8 +62,10 @@ task ObservabilityHelloWorldClient(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(ObservabilityHelloWorldServer) applicationDistribution.into('bin') {
from(ObservabilityHelloWorldClient) from(ObservabilityHelloWorldServer)
fileMode = 0755 from(ObservabilityHelloWorldClient)
fileMode = 0755
}
} }

2
examples/example-hostname/build.gradle
View File

@ -2,7 +2,7 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples. id 'application' // Provide convenience executables for trying out the examples.
id 'java' id 'java'
id "com.google.protobuf" version "0.8.17" id "com.google.protobuf" version "0.9.4"
id 'com.google.cloud.tools.jib' version '3.1.4' // For releasing to Docker Hub id 'com.google.cloud.tools.jib' version '3.1.4' // For releasing to Docker Hub
} }

13
examples/example-jwt-auth/build.gradle
View File

@ -1,8 +1,7 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }
@ -79,8 +78,10 @@ task hellowWorldJwtAuthClient(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(hellowWorldJwtAuthServer) applicationDistribution.into('bin') {
from(hellowWorldJwtAuthClient) from(hellowWorldJwtAuthServer)
fileMode = 0755 from(hellowWorldJwtAuthClient)
fileMode = 0755
}
} }

13
examples/example-orca/build.gradle
View File

@ -1,7 +1,6 @@
plugins { plugins {
id 'application' // Provide convenience executables for trying out the examples. id 'application' // Provide convenience executables for trying out the examples.
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
id 'java' id 'java'
@ -57,8 +56,10 @@ task CustomBackendMetricsServer(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(CustomBackendMetricsClient) applicationDistribution.into('bin') {
from(CustomBackendMetricsServer) from(CustomBackendMetricsClient)
fileMode = 0755 from(CustomBackendMetricsServer)
fileMode = 0755
}
} }

11
examples/example-reflection/build.gradle
View File

@ -1,7 +1,6 @@
plugins { plugins {
id 'application' // Provide convenience executables for trying out the examples. id 'application' // Provide convenience executables for trying out the examples.
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
id 'java' id 'java'
@ -50,7 +49,9 @@ task ReflectionServer(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(ReflectionServer) applicationDistribution.into('bin') {
fileMode = 0755 from(ReflectionServer)
fileMode = 0755
}
} }

3
examples/example-servlet/build.gradle
View File

@ -1,6 +1,5 @@
plugins { plugins {
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
id 'war' id 'war'

13
examples/example-tls/build.gradle
View File

@ -1,8 +1,7 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }
@ -71,8 +70,10 @@ task helloWorldTlsClient(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(helloWorldTlsServer) applicationDistribution.into('bin') {
from(helloWorldTlsClient) from(helloWorldTlsServer)
fileMode = 0755 from(helloWorldTlsClient)
fileMode = 0755
}
} }

13
examples/example-xds/build.gradle
View File

@ -1,7 +1,6 @@
plugins { plugins {
id 'application' // Provide convenience executables for trying out the examples. id 'application' // Provide convenience executables for trying out the examples.
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.8.17'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
id 'java' id 'java'
@ -63,8 +62,10 @@ task xdsHelloWorldServer(type: CreateStartScripts) {
classpath = startScripts.classpath classpath = startScripts.classpath
} }
applicationDistribution.into('bin') { application {
from(xdsHelloWorldClient) applicationDistribution.into('bin') {
from(xdsHelloWorldServer) from(xdsHelloWorldClient)
fileMode = 0755 from(xdsHelloWorldServer)
fileMode = 0755
}
} }

2
examples/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists