Update dependencies (#37)

curioswitch · Oct 2, 2024 · ba98f5e · ba98f5e
1 parent 65a5e32
commit ba98f5e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -8,10 +8,10 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 val DEPENDENCY_BOMS = listOf(
-  "com.fasterxml.jackson:jackson-bom:2.16.1",
-  "com.google.guava:guava-bom:33.0.0-jre",
+  "com.fasterxml.jackson:jackson-bom:2.18.0",
+  "com.google.guava:guava-bom:33.3.1-jre",
   "com.google.protobuf:protobuf-bom:${System.getenv("PROTOBUF_VERSION").orEmpty().ifEmpty { "4.28.2" }}",
-  "org.junit:junit-bom:5.10.1",
+  "org.junit:junit-bom:5.11.1",
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -23,11 +23,11 @@ val DEPENDENCY_SETS = listOf(
 )
 
 val DEPENDENCIES = listOf(
-  "com.google.code.findbugs:annotations:3.0.1u2",
+  "com.google.code.findbugs:annotations:3.0.1",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.uber.nullaway:nullaway:0.11.3",
-  "net.bytebuddy:byte-buddy:1.14.4",
-  "org.assertj:assertj-core:3.24.2",
+  "net.bytebuddy:byte-buddy:1.15.3",
+  "org.assertj:assertj-core:3.26.3",
 )
 
 javaPlatform {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
-    id("com.github.ben-manes.versions") version "0.40.0"
-    id("org.curioswitch.gradle-protobuf-plugin") version "0.4.0"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    id("org.curioswitch.gradle-protobuf-plugin") version "0.5.0"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
   }
 }

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/WellKnownTypeMarshaller.java b/src/main/java/org/curioswitch/common/protobuf/json/WellKnownTypeMarshaller.java
@@ -341,7 +341,7 @@ public void doMerge(JsonParser parser, int currentDepth, Message.Builder message
       Struct.Builder builder = (Struct.Builder) messageBuilder;
       while (parser.nextValue() != JsonToken.END_OBJECT) {
         builder.putFields(
-            parser.getCurrentName(), ValueMarshaller.INSTANCE.readValue(parser, currentDepth + 1));
+            parser.currentName(), ValueMarshaller.INSTANCE.readValue(parser, currentDepth + 1));
       }
     }
 
@@ -476,7 +476,7 @@ public void doMerge(JsonParser parser, int currentDepth, Message.Builder message
         return;
       }
       Any.Builder builder = (Any.Builder) messageBuilder;
-      if (!parser.getCurrentName().equals("@type")) {
+      if (!parser.currentName().equals("@type")) {
         throw new InvalidProtocolBufferException(
             "MessageMarshaller requires @type to must be the "
                 + "first field of an Any. If you need to support @type in any location, use "
@@ -488,7 +488,7 @@ public void doMerge(JsonParser parser, int currentDepth, Message.Builder message
       builder.setTypeUrl(typeUrl);
       if (contentMarshaller instanceof WellKnownTypeMarshaller) {
         parser.nextValue();
-        if (parser.getCurrentName().equals("value")) {
+        if (parser.currentName().equals("value")) {
           builder.setValue(contentMarshaller.readValue(parser, currentDepth).toByteString());
         }
         // Well-known types will not finish parsing the current object (they don't readValue