Skip to content

Commit 773c9c2

Browse files
committed
Document update nuances
1 parent ed70c55 commit 773c9c2

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ tasks.register('checkForUpdates') {
579579
if (oldResolved != newResolved) {
580580
def oldId = oldResolved.id.componentIdentifier
581581
def newId = newResolved.id.componentIdentifier
582-
println("${newId.group}:${newId.module} ${oldId.version} -> ${newId.version}")
582+
println("libs.${name} = ${newId.group}:${newId.module} ${oldId.version} -> ${newId.version}")
583583
}
584584
}
585585
}

gradle/libs.versions.toml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22
# Compatibility problem with internal version getting onto 1.5.3.
33
# https://github.com/grpc/grpc-java/pull/9118
44
googleauth = "1.4.0"
5+
# Update notes / 2023-07-19 sergiitk:
6+
# Couldn't update to 32.1.1 because Guava 32.1.0 broke gradle metadata:
7+
# https://github.com/google/guava/releases/tag/v32.1.0
8+
# 32.1.1 partially fixed this, but our build still breaks with:
9+
# Could not resolve com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava.
10+
#
511
# TODO(any release manager): attempt removing runtimeOnly dependencies when guava upgraded:
612
# - okhttp: errorprone.annotations
7-
guava = "32.0.1-android"
13+
#
14+
# Allowed to be different from guava-jre.
15+
guava = '32.0.1-android'
816
netty = '4.1.94.Final'
917
# Keep the following references of tcnative version in sync whenever it's updated:
1018
# SECURITY.md
@@ -26,13 +34,11 @@ animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
2634
auto-value = "com.google.auto.value:auto-value:1.10.2"
2735
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.2"
2836
checkstyle = "com.puppycrawl.tools:checkstyle:10.12.1"
29-
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
3037
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
3138
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
3239
cronet-api = "org.chromium.net:cronet-api:108.5359.79"
3340
cronet-embedded = "org.chromium.net:cronet-embedded:108.5359.79"
3441
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.20.0"
35-
errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0"
3642
errorprone-core = "com.google.errorprone:error_prone_core:2.20.0"
3743
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.22.0"
3844
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" }
@@ -42,6 +48,8 @@ gson = "com.google.code.gson:gson:2.10.1"
4248
guava = { module = "com.google.guava:guava", version.ref = "guava" }
4349
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
4450
guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
51+
# JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability.
52+
# May be different from the -android version.
4553
guava-jre = "com.google.guava:guava:32.0.1-jre"
4654
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12"
4755
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
@@ -75,3 +83,9 @@ robolectric = "org.robolectric:robolectric:4.10.3"
7583
signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
7684
signature-java = "org.codehaus.mojo.signature:java18:1.0"
7785
truth = "com.google.truth:truth:1.1.5"
86+
87+
# Do not update: Pinned to the last version supporting Java 8.
88+
# See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1
89+
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
90+
# See https://github.com/google/error-prone/releases/tag/v2.11.0
91+
errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0"

0 commit comments

Comments
 (0)