Skip to content

Commit ceadf6d

Browse files
ejona86ejona86
committed
Upgrade to Gradle 8.3
Examples are updated to use the new version as well, which wasn't done last time in f3f4ed4. That noticed some things that were missed before.
1 parent 67f4eab commit ceadf6d

File tree

14 files changed

+70
-59
lines changed

14 files changed

+70
-59
lines changed

Diff for: ‎examples/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@ def createStartScripts(String mainClassName) {
7878
outputDir = new File(project.buildDir, 'tmp/scripts/' + name)
7979
classpath = startScripts.classpath
8080
}
81-
applicationDistribution.into('bin') {
82-
from(newTask)
83-
fileMode = 0755
81+
application {
82+
applicationDistribution.into('bin') {
83+
from(newTask)
84+
fileMode = 0755
85+
}
8486
}
8587
}
8688

Diff for: ‎examples/example-alts/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
22
// Provide convenience executables for trying out the examples.
33
id 'application'
4-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
5-
id 'com.google.protobuf' version '0.8.17'
4+
id 'com.google.protobuf' version '0.9.4'
65
// Generate IntelliJ IDEA's .idea & .iml project files
76
id 'idea'
87
}
@@ -71,8 +70,10 @@ task helloWorldAltsClient(type: CreateStartScripts) {
7170
classpath = startScripts.classpath
7271
}
7372

74-
applicationDistribution.into('bin') {
75-
from(helloWorldAltsServer)
76-
from(helloWorldAltsClient)
77-
fileMode = 0755
73+
application {
74+
applicationDistribution.into('bin') {
75+
from(helloWorldAltsServer)
76+
from(helloWorldAltsClient)
77+
fileMode = 0755
78+
}
7879
}

Diff for: ‎examples/example-debug/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'application' // Provide convenience executables for trying out the examples.
33
id 'java'
44

5-
id "com.google.protobuf" version "0.8.17"
5+
id "com.google.protobuf" version "0.9.4"
66

77
// Generate IntelliJ IDEA's .idea & .iml project files
88
id 'idea'
@@ -71,8 +71,10 @@ task HostnameDebuggableServer(type: CreateStartScripts) {
7171
classpath = startScripts.classpath
7272
}
7373

74-
applicationDistribution.into('bin') {
75-
from(HelloWorldDebuggableClient)
76-
from(HostnameDebuggableServer)
77-
fileMode = 0755
74+
application {
75+
applicationDistribution.into('bin') {
76+
from(HelloWorldDebuggableClient)
77+
from(HostnameDebuggableServer)
78+
fileMode = 0755
79+
}
7880
}

Diff for: ‎examples/example-gauth/build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
22
// Provide convenience executables for trying out the examples.
33
id 'application'
4-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
5-
id 'com.google.protobuf' version '0.8.17'
4+
id 'com.google.protobuf' version '0.9.4'
65
// Generate IntelliJ IDEA's .idea & .iml project files
76
id 'idea'
87
}
@@ -69,7 +68,9 @@ task googleAuthClient(type: CreateStartScripts) {
6968
classpath = startScripts.classpath
7069
}
7170

72-
applicationDistribution.into('bin') {
73-
from(googleAuthClient)
74-
fileMode = 0755
71+
application {
72+
applicationDistribution.into('bin') {
73+
from(googleAuthClient)
74+
fileMode = 0755
75+
}
7576
}

Diff for: ‎examples/example-gcp-observability/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
22
// Provide convenience executables for trying out the examples.
33
id 'application'
4-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
5-
id 'com.google.protobuf' version '0.8.17'
4+
id 'com.google.protobuf' version '0.9.4'
65
// Generate IntelliJ IDEA's .idea & .iml project files
76
id 'idea'
87
id 'java'
@@ -63,8 +62,10 @@ task ObservabilityHelloWorldClient(type: CreateStartScripts) {
6362
classpath = startScripts.classpath
6463
}
6564

66-
applicationDistribution.into('bin') {
67-
from(ObservabilityHelloWorldServer)
68-
from(ObservabilityHelloWorldClient)
69-
fileMode = 0755
65+
application {
66+
applicationDistribution.into('bin') {
67+
from(ObservabilityHelloWorldServer)
68+
from(ObservabilityHelloWorldClient)
69+
fileMode = 0755
70+
}
7071
}

Diff for: ‎examples/example-hostname/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'application' // Provide convenience executables for trying out the examples.
33
id 'java'
44

5-
id "com.google.protobuf" version "0.8.17"
5+
id "com.google.protobuf" version "0.9.4"
66
id 'com.google.cloud.tools.jib' version '3.1.4' // For releasing to Docker Hub
77
}
88

Diff for: ‎examples/example-jwt-auth/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
22
// Provide convenience executables for trying out the examples.
33
id 'application'
4-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
5-
id 'com.google.protobuf' version '0.8.17'
4+
id 'com.google.protobuf' version '0.9.4'
65
// Generate IntelliJ IDEA's .idea & .iml project files
76
id 'idea'
87
}
@@ -79,8 +78,10 @@ task hellowWorldJwtAuthClient(type: CreateStartScripts) {
7978
classpath = startScripts.classpath
8079
}
8180

82-
applicationDistribution.into('bin') {
83-
from(hellowWorldJwtAuthServer)
84-
from(hellowWorldJwtAuthClient)
85-
fileMode = 0755
81+
application {
82+
applicationDistribution.into('bin') {
83+
from(hellowWorldJwtAuthServer)
84+
from(hellowWorldJwtAuthClient)
85+
fileMode = 0755
86+
}
8687
}

Diff for: ‎examples/example-orca/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'application' // Provide convenience executables for trying out the examples.
3-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
4-
id 'com.google.protobuf' version '0.8.17'
3+
id 'com.google.protobuf' version '0.9.4'
54
// Generate IntelliJ IDEA's .idea & .iml project files
65
id 'idea'
76
id 'java'
@@ -57,8 +56,10 @@ task CustomBackendMetricsServer(type: CreateStartScripts) {
5756
classpath = startScripts.classpath
5857
}
5958

60-
applicationDistribution.into('bin') {
61-
from(CustomBackendMetricsClient)
62-
from(CustomBackendMetricsServer)
63-
fileMode = 0755
59+
application {
60+
applicationDistribution.into('bin') {
61+
from(CustomBackendMetricsClient)
62+
from(CustomBackendMetricsServer)
63+
fileMode = 0755
64+
}
6465
}

Diff for: ‎examples/example-reflection/build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'application' // Provide convenience executables for trying out the examples.
3-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
4-
id 'com.google.protobuf' version '0.8.17'
3+
id 'com.google.protobuf' version '0.9.4'
54
// Generate IntelliJ IDEA's .idea & .iml project files
65
id 'idea'
76
id 'java'
@@ -50,7 +49,9 @@ task ReflectionServer(type: CreateStartScripts) {
5049
classpath = startScripts.classpath
5150
}
5251

53-
applicationDistribution.into('bin') {
54-
from(ReflectionServer)
55-
fileMode = 0755
52+
application {
53+
applicationDistribution.into('bin') {
54+
from(ReflectionServer)
55+
fileMode = 0755
56+
}
5657
}

Diff for: ‎examples/example-servlet/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
3-
id 'com.google.protobuf' version '0.8.17'
2+
id 'com.google.protobuf' version '0.9.4'
43
// Generate IntelliJ IDEA's .idea & .iml project files
54
id 'idea'
65
id 'war'

Diff for: ‎examples/example-tls/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
plugins {
22
// Provide convenience executables for trying out the examples.
33
id 'application'
4-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
5-
id 'com.google.protobuf' version '0.8.17'
4+
id 'com.google.protobuf' version '0.9.4'
65
// Generate IntelliJ IDEA's .idea & .iml project files
76
id 'idea'
87
}
@@ -71,8 +70,10 @@ task helloWorldTlsClient(type: CreateStartScripts) {
7170
classpath = startScripts.classpath
7271
}
7372

74-
applicationDistribution.into('bin') {
75-
from(helloWorldTlsServer)
76-
from(helloWorldTlsClient)
77-
fileMode = 0755
73+
application {
74+
applicationDistribution.into('bin') {
75+
from(helloWorldTlsServer)
76+
from(helloWorldTlsClient)
77+
fileMode = 0755
78+
}
7879
}

Diff for: ‎examples/example-xds/build.gradle

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'application' // Provide convenience executables for trying out the examples.
3-
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
4-
id 'com.google.protobuf' version '0.8.17'
3+
id 'com.google.protobuf' version '0.9.4'
54
// Generate IntelliJ IDEA's .idea & .iml project files
65
id 'idea'
76
id 'java'
@@ -63,8 +62,10 @@ task xdsHelloWorldServer(type: CreateStartScripts) {
6362
classpath = startScripts.classpath
6463
}
6564

66-
applicationDistribution.into('bin') {
67-
from(xdsHelloWorldClient)
68-
from(xdsHelloWorldServer)
69-
fileMode = 0755
65+
application {
66+
applicationDistribution.into('bin') {
67+
from(xdsHelloWorldClient)
68+
from(xdsHelloWorldServer)
69+
fileMode = 0755
70+
}
7071
}

Diff for: ‎examples/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)