Upgrade Gradle and Gradle plugins

This commit is contained in:
Eric Anderson 2024-07-10 12:58:42 -07:00
parent a977385187
commit 64ac792b5e
20 changed files with 55 additions and 26 deletions

View File

@ -107,7 +107,9 @@ application {
from(openloop_client) from(openloop_client)
from(qps_server) from(qps_server)
from(benchmark_worker) from(benchmark_worker)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -82,7 +82,9 @@ def createStartScripts(String mainClassName) {
application { application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(newTask) from(newTask)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }
} }

View File

@ -74,6 +74,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(helloWorldAltsServer) from(helloWorldAltsServer)
from(helloWorldAltsClient) from(helloWorldAltsClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -75,6 +75,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(HelloWorldDebuggableClient) from(HelloWorldDebuggableClient)
from(HostnameDebuggableServer) from(HostnameDebuggableServer)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -71,6 +71,8 @@ task googleAuthClient(type: CreateStartScripts) {
application { application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(googleAuthClient) from(googleAuthClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -72,6 +72,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(CsmObservabilityHelloWorldServer) from(CsmObservabilityHelloWorldServer)
from(CsmObservabilityHelloWorldClient) from(CsmObservabilityHelloWorldClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -66,6 +66,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(ObservabilityHelloWorldServer) from(ObservabilityHelloWorldServer)
from(ObservabilityHelloWorldClient) from(ObservabilityHelloWorldClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -3,7 +3,7 @@ plugins {
id 'java' id 'java'
id "com.google.protobuf" version "0.9.4" 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 { repositories {

View File

@ -83,6 +83,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(hellowWorldJwtAuthServer) from(hellowWorldJwtAuthServer)
from(hellowWorldJwtAuthClient) from(hellowWorldJwtAuthClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -83,6 +83,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(hellowWorldOauthServer) from(hellowWorldOauthServer)
from(hellowWorldOauthClient) from(hellowWorldOauthClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -87,6 +87,8 @@ application {
from(OpenTelemetryHelloWorldClient) from(OpenTelemetryHelloWorldClient)
from(LoggingOpenTelemetryHelloWorldServer) from(LoggingOpenTelemetryHelloWorldServer)
from(LoggingOpenTelemetryHelloWorldClient) from(LoggingOpenTelemetryHelloWorldClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -60,6 +60,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(CustomBackendMetricsClient) from(CustomBackendMetricsClient)
from(CustomBackendMetricsServer) from(CustomBackendMetricsServer)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -52,6 +52,8 @@ task ReflectionServer(type: CreateStartScripts) {
application { application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(ReflectionServer) from(ReflectionServer)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -74,6 +74,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(helloWorldTlsServer) from(helloWorldTlsServer)
from(helloWorldTlsClient) from(helloWorldTlsClient)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -66,6 +66,8 @@ application {
applicationDistribution.into('bin') { applicationDistribution.into('bin') {
from(xdsHelloWorldClient) from(xdsHelloWorldClient)
from(xdsHelloWorldServer) from(xdsHelloWorldServer)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

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.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -28,7 +28,7 @@ plugins {
id "war" id "war"
id "ru.vyarus.animalsniffer" 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)' description = 'gRPC: gae interop testing (jdk8)'
@ -40,8 +40,6 @@ repositories {
url "https://maven-central.storage-download.googleapis.com/maven2/" } url "https://maven-central.storage-download.googleapis.com/maven2/" }
} }
apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks
dependencies { dependencies {
providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5' providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
runtimeOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.59' runtimeOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.59'

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View File

@ -162,7 +162,9 @@ application {
from(xds_test_client) from(xds_test_client)
from(xds_test_server) from(xds_test_server)
from(xds_federation_test_client) from(xds_federation_test_client)
fileMode = 0755 filePermissions {
unix(0755)
}
} }
} }

View File

@ -1,16 +1,17 @@
pluginManagement { pluginManagement {
plugins { plugins {
// https://developer.android.com/build/releases/gradle-plugin // 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.application" version "7.4.1"
id "com.android.library" version "7.4.1" id "com.android.library" version "7.4.1"
// https://github.com/johnrengelman/shadow/releases // https://github.com/johnrengelman/shadow/releases
id "com.github.johnrengelman.shadow" version "8.1.1" id "com.github.johnrengelman.shadow" version "8.1.1"
// https://github.com/kt3k/coveralls-gradle-plugin/tags // https://github.com/kt3k/coveralls-gradle-plugin/tags
id "com.github.kt3k.coveralls" version "2.12.2" id "com.github.kt3k.coveralls" version "2.12.2"
// https://github.com/GoogleCloudPlatform/appengine-plugins/blob/main/app-gradle-plugin/CHANGELOG.md // https://github.com/GoogleCloudPlatform/appengine-plugins/releases
id "com.google.cloud.tools.appengine" version "2.5.0" id "com.google.cloud.tools.appengine" version "2.8.0"
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md // 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 // https://github.com/google/osdetector-gradle-plugin/tags
id "com.google.osdetector" version "1.7.3" id "com.google.osdetector" version "1.7.3"
// https://github.com/google/protobuf-gradle-plugin/releases // https://github.com/google/protobuf-gradle-plugin/releases
@ -20,7 +21,7 @@ pluginManagement {
// https://github.com/melix/jmh-gradle-plugin/releases // https://github.com/melix/jmh-gradle-plugin/releases
id "me.champeau.jmh" version "0.7.2" id "me.champeau.jmh" version "0.7.2"
// https://github.com/tbroyer/gradle-errorprone-plugin/releases // 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 // https://github.com/xvik/gradle-animalsniffer-plugin/releases
id "ru.vyarus.animalsniffer" version "1.7.1" id "ru.vyarus.animalsniffer" version "1.7.1"
} }
@ -30,7 +31,7 @@ pluginManagement {
useModule("com.android.tools.build:gradle:${target.version}") useModule("com.android.tools.build:gradle:${target.version}")
} }
if (requested.id.id.startsWith('com.google.cloud.tools.appengine')) { 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}")
} }
} }
} }