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

View File

@ -78,10 +78,12 @@ def createStartScripts(String mainClassName) {
outputDir = new File(project.buildDir, 'tmp/scripts/' + name)
classpath = startScripts.classpath
}
application {
applicationDistribution.into('bin') {
from(newTask)
fileMode = 0755
}
}
}
createStartScripts('io.grpc.examples.advanced.HelloJsonClient')

View File

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

View File

@ -2,7 +2,7 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples.
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
id 'idea'
@ -71,8 +71,10 @@ task HostnameDebuggableServer(type: CreateStartScripts) {
classpath = startScripts.classpath
}
applicationDistribution.into('bin') {
application {
applicationDistribution.into('bin') {
from(HelloWorldDebuggableClient)
from(HostnameDebuggableServer)
fileMode = 0755
}
}

View File

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

View File

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

View File

@ -2,7 +2,7 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples.
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
}

View File

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

View File

@ -1,7 +1,6 @@
plugins {
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.8.17'
id 'com.google.protobuf' version '0.9.4'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
id 'java'
@ -57,8 +56,10 @@ task CustomBackendMetricsServer(type: CreateStartScripts) {
classpath = startScripts.classpath
}
applicationDistribution.into('bin') {
application {
applicationDistribution.into('bin') {
from(CustomBackendMetricsClient)
from(CustomBackendMetricsServer)
fileMode = 0755
}
}

View File

@ -1,7 +1,6 @@
plugins {
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.8.17'
id 'com.google.protobuf' version '0.9.4'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
id 'java'
@ -50,7 +49,9 @@ task ReflectionServer(type: CreateStartScripts) {
classpath = startScripts.classpath
}
applicationDistribution.into('bin') {
application {
applicationDistribution.into('bin') {
from(ReflectionServer)
fileMode = 0755
}
}

View File

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

View File

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

View File

@ -1,7 +1,6 @@
plugins {
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.8.17'
id 'com.google.protobuf' version '0.9.4'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
id 'java'
@ -63,8 +62,10 @@ task xdsHelloWorldServer(type: CreateStartScripts) {
classpath = startScripts.classpath
}
applicationDistribution.into('bin') {
application {
applicationDistribution.into('bin') {
from(xdsHelloWorldClient)
from(xdsHelloWorldServer)
fileMode = 0755
}
}

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists