Merge 23.7 to 23.11

LabKey · Dec 11, 2023 · d014850 · d014850
2 parents e523d51 + 024eccb
commit d014850
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -242,7 +242,7 @@ allprojects {
                     // Force patched version of GPRC, dependency of a number of Google service APIs in WNPRC and fileTransfer
                     force "io.grpc:grpc-context:${grpcVersion}"
 
-                    // TODO Remove these when the Picard version brought in by the SequenceAnalysis module is upgraded to use a version >=1.57.2
+                    // TODO Remove these when the Picard version brought in by the SequenceAnalysis module is upgraded to use a version of grpc > 1.60.0
                     force "io.grpc:grpc-alts:${grpcVersion}"
                     force "io.grpc:grpc-auth:${grpcVersion}"
                     force "io.grpc:grpc-core:${grpcVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -171,7 +171,7 @@ graalVersion=23.0.2
 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
 gsonVersion=2.8.9
 
-grpcVersion=1.59.0
+grpcVersion=1.60.0
 
 guavaVersion=32.1.3-jre
 gwtVersion=2.10.0