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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/build.gradle
View File

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

4
examples/build.gradle
View File

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

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

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

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

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

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

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

4
examples/example-gcp-csm-observability/build.gradle
View File

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

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

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

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

@ -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 {

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

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

4
examples/example-oauth/build.gradle
View File

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

4
examples/example-opentelemetry/build.gradle
View File

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

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

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

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

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

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

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

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

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

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

@ -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

4
gae-interop-testing/gae-jdk8/build.gradle
View File

@ -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'

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

@ -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

4
interop-testing/build.gradle
View File

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

11
settings.gradle
View File

@ -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}")
}
}
}