diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 5c9e1125f0b..d00c0d76ebe 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -107,7 +107,9 @@ application { from(openloop_client) from(qps_server) from(benchmark_worker) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/build.gradle b/examples/build.gradle index f27403a4e1f..c9213cc6a21 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -82,7 +82,9 @@ def createStartScripts(String mainClassName) { application { applicationDistribution.into('bin') { from(newTask) - fileMode = 0755 + filePermissions { + unix(0755) + } } } } diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index eedae774a9e..06b7ac501d0 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -74,6 +74,8 @@ application { applicationDistribution.into('bin') { from(helloWorldAltsServer) from(helloWorldAltsClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index 7d04156b572..624483f663e 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -75,6 +75,8 @@ application { applicationDistribution.into('bin') { from(HelloWorldDebuggableClient) from(HostnameDebuggableServer) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 82284164b13..c43443c3860 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -71,6 +71,8 @@ task googleAuthClient(type: CreateStartScripts) { application { applicationDistribution.into('bin') { from(googleAuthClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-gcp-csm-observability/build.gradle b/examples/example-gcp-csm-observability/build.gradle index d46a851e6cc..a24490918b5 100644 --- a/examples/example-gcp-csm-observability/build.gradle +++ b/examples/example-gcp-csm-observability/build.gradle @@ -72,6 +72,8 @@ application { applicationDistribution.into('bin') { from(CsmObservabilityHelloWorldServer) from(CsmObservabilityHelloWorldClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index 34a8b8d08b0..d6dd1aedc6e 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -66,6 +66,8 @@ application { applicationDistribution.into('bin') { from(ObservabilityHelloWorldServer) from(ObservabilityHelloWorldClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 7cf18ef9f0c..ee5e5cf5c70 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id "com.google.protobuf" version "0.9.4" - id 'com.google.cloud.tools.jib' version '3.4.1' // For releasing to Docker Hub + id 'com.google.cloud.tools.jib' version '3.4.3' // For releasing to Docker Hub } repositories { diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 92ab27b83ce..2ad3c91f190 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -83,6 +83,8 @@ application { applicationDistribution.into('bin') { from(hellowWorldJwtAuthServer) from(hellowWorldJwtAuthClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index 37612591691..23a6633e264 100644 --- a/examples/example-oauth/build.gradle +++ b/examples/example-oauth/build.gradle @@ -83,6 +83,8 @@ application { applicationDistribution.into('bin') { from(hellowWorldOauthServer) from(hellowWorldOauthClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-opentelemetry/build.gradle b/examples/example-opentelemetry/build.gradle index c53f204d7bf..55d6685d771 100644 --- a/examples/example-opentelemetry/build.gradle +++ b/examples/example-opentelemetry/build.gradle @@ -87,6 +87,8 @@ application { from(OpenTelemetryHelloWorldClient) from(LoggingOpenTelemetryHelloWorldServer) from(LoggingOpenTelemetryHelloWorldClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 39be9b9d388..f3eae10ace4 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -60,6 +60,8 @@ application { applicationDistribution.into('bin') { from(CustomBackendMetricsClient) from(CustomBackendMetricsServer) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index e24100cad79..0b5c99898ed 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -52,6 +52,8 @@ task ReflectionServer(type: CreateStartScripts) { application { applicationDistribution.into('bin') { from(ReflectionServer) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 5d8d0296dc5..3791cc03271 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -74,6 +74,8 @@ application { applicationDistribution.into('bin') { from(helloWorldTlsServer) from(helloWorldTlsClient) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 22c6141fed5..9807b1f8b74 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -66,6 +66,8 @@ application { applicationDistribution.into('bin') { from(xdsHelloWorldClient) from(xdsHelloWorldServer) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 17655d0ef2b..0d1842103b1 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle index f3ff765ddfb..a09a8e793c0 100644 --- a/gae-interop-testing/gae-jdk8/build.gradle +++ b/gae-interop-testing/gae-jdk8/build.gradle @@ -28,7 +28,7 @@ plugins { id "war" id "ru.vyarus.animalsniffer" - id 'com.google.cloud.tools.appengine' version '2.3.0' + id 'com.google.cloud.tools.appengine' } description = 'gRPC: gae interop testing (jdk8)' @@ -40,8 +40,6 @@ repositories { url "https://maven-central.storage-download.googleapis.com/maven2/" } } -apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks - dependencies { providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5' runtimeOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.59' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5cf..a4413138c96 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index ca945f46318..d6155761c04 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -162,7 +162,9 @@ application { from(xds_test_client) from(xds_test_server) from(xds_federation_test_client) - fileMode = 0755 + filePermissions { + unix(0755) + } } } diff --git a/settings.gradle b/settings.gradle index 6359db91c39..61972e30b6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,16 +1,17 @@ pluginManagement { plugins { // https://developer.android.com/build/releases/gradle-plugin + // 8+ has many changes: https://github.com/grpc/grpc-java/issues/10152 id "com.android.application" version "7.4.1" id "com.android.library" version "7.4.1" // https://github.com/johnrengelman/shadow/releases id "com.github.johnrengelman.shadow" version "8.1.1" // https://github.com/kt3k/coveralls-gradle-plugin/tags id "com.github.kt3k.coveralls" version "2.12.2" - // https://github.com/GoogleCloudPlatform/appengine-plugins/blob/main/app-gradle-plugin/CHANGELOG.md - id "com.google.cloud.tools.appengine" version "2.5.0" + // https://github.com/GoogleCloudPlatform/appengine-plugins/releases + id "com.google.cloud.tools.appengine" version "2.8.0" // https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md - id "com.google.cloud.tools.jib" version "3.4.1" + id "com.google.cloud.tools.jib" version "3.4.3" // https://github.com/google/osdetector-gradle-plugin/tags id "com.google.osdetector" version "1.7.3" // https://github.com/google/protobuf-gradle-plugin/releases @@ -20,7 +21,7 @@ pluginManagement { // https://github.com/melix/jmh-gradle-plugin/releases id "me.champeau.jmh" version "0.7.2" // https://github.com/tbroyer/gradle-errorprone-plugin/releases - id "net.ltgt.errorprone" version "3.1.0" + id "net.ltgt.errorprone" version "4.0.1" // https://github.com/xvik/gradle-animalsniffer-plugin/releases id "ru.vyarus.animalsniffer" version "1.7.1" } @@ -30,7 +31,7 @@ pluginManagement { useModule("com.android.tools.build:gradle:${target.version}") } if (requested.id.id.startsWith('com.google.cloud.tools.appengine')) { - useModule("com.google.cloud.tools:appengine-gradle-plugin:${requested.version}") + useModule("com.google.cloud.tools:appengine-gradle-plugin:${target.version}") } } }