Skip to content

Commit 0077c16

Browse files
authored
Merge pull request #731 from googleads/shared-deps-3-14-0
Upgrade to Gradle 7.6.2 and shared dependencies 3.14.0
2 parents f154ad9 + 88b7236 commit 0077c16

6 files changed

Lines changed: 181 additions & 118 deletions

File tree

buildSrc/src/main/groovy/com.google.api-ads.java-conventions.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ dependencies {
172172
api 'io.grpc:grpc-protobuf'
173173
api 'com.google.auth:google-auth-library-oauth2-http'
174174
api 'com.google.auth:google-auth-library-credentials'
175-
api platform('com.google.cloud:google-cloud-shared-dependencies:3.11.0')
175+
api platform('com.google.cloud:google-cloud-shared-dependencies:3.14.0')
176176
implementation 'com.google.guava:guava'
177177
implementation 'com.google.auto.service:auto-service:1.0.1'
178178
implementation 'javax.annotation:javax.annotation-api'

google-ads/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import static nl.javadude.gradle.plugins.license.DownloadLicensesExtension.licen
2828
plugins {
2929
id 'com.google.api-ads.java-conventions'
3030
id 'com.google.protobuf' version '0.8.15'
31-
id "com.github.hierynomus.license-report" version "0.15.0"
31+
id "com.github.hierynomus.license-report" version "0.16.1"
3232
}
3333

3434
description = 'Google Ads API client library for Java'
@@ -62,14 +62,14 @@ protobuf {
6262
dependencies {
6363
api project(':google-ads-codegen')
6464
implementation 'org.slf4j:slf4j-api:1.7.25'
65-
annotationProcessor 'com.google.auto.value:auto-value:1.10.1'
65+
annotationProcessor 'com.google.auto.value:auto-value:1.10.2'
6666
testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
6767
testImplementation 'org.mockito:mockito-all:1.9.5'
6868
testImplementation 'com.google.api:gax-grpc::testlib'
69-
testImplementation 'io.grpc:grpc-context:1.55.1'
69+
testImplementation 'io.grpc:grpc-context'
7070
testImplementation 'com.google.truth:truth:0.27'
71-
implementation 'com.google.auto.value:auto-value-annotations:1.10.1'
72-
testImplementation 'com.google.auto.value:auto-value-annotations:1.10.1'
71+
implementation 'com.google.auto.value:auto-value-annotations:1.10.2'
72+
testImplementation 'com.google.auto.value:auto-value-annotations:1.10.2'
7373
testImplementation testFixtures(project(':google-ads-codegen'))
7474
}
7575

gradle/wrapper/gradle-wrapper.jar

2.36 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 164 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)