diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index b1e49ca6b54..25b706fc845 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -14,7 +14,7 @@ description = 'Ad Service' group = "adservice" version = "0.1.0-SNAPSHOT" -def grpcVersion = "1.68.2" +def grpcVersion = "1.69.0" def jacksonCoreVersion = "2.18.2" def jacksonDatabindVersion = "2.18.2" def protocVersion = "3.25.5" @@ -33,14 +33,14 @@ dependencies { if (speed) { implementation fileTree(dir: offlineCompile, include: '*.jar') } else { - implementation "com.google.api.grpc:proto-google-common-protos:2.49.0", + implementation "com.google.api.grpc:proto-google-common-protos:2.50.0", "javax.annotation:javax.annotation-api:1.3.2", "io.grpc:grpc-protobuf:${grpcVersion}", "io.grpc:grpc-stub:${grpcVersion}", "io.grpc:grpc-netty:${grpcVersion}", "io.grpc:grpc-services:${grpcVersion}", "io.grpc:grpc-census:${grpcVersion}", - "org.apache.logging.log4j:log4j-core:2.24.2", + "org.apache.logging.log4j:log4j-core:2.24.3", "com.google.protobuf:protobuf-java:${protocVersion}" runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonCoreVersion}", @@ -67,7 +67,7 @@ protobuf { } googleJavaFormat { - toolVersion '1.25.0' + toolVersion '1.25.2' } // Inform IDEs like IntelliJ IDEA, Eclipse or NetBeans about the generated code. diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/adservice/gradle/wrapper/gradle-wrapper.properties index e2847c82004..cea7a793a84 100644 --- a/src/adservice/gradle/wrapper/gradle-wrapper.properties +++ b/src/adservice/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/adservice/gradlew b/src/adservice/gradlew index f5feea6d6b1..f3b75f3b0d4 100644 --- a/src/adservice/gradlew +++ b/src/adservice/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum